]> git.mxchange.org Git - friendica.git/commitdiff
ZH-CN: update to the strings
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 8 Feb 2013 16:26:08 +0000 (17:26 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 8 Feb 2013 16:26:08 +0000 (17:26 +0100)
view/zh-cn/messages.po
view/zh-cn/strings.php

index 4aa8780e32afbe25bdb843e5065e0603ff812170..d7bb3e5bf15fc4b92edae8063ae3ea2eb769bef0 100644 (file)
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-01-27 10:00-0800\n"
-"PO-Revision-Date: 2013-02-03 11:16+0000\n"
+"POT-Creation-Date: 2013-02-07 10:00-0800\n"
+"PO-Revision-Date: 2013-02-07 11:00+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,11 +40,11 @@ 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/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:1041
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../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/settings.php:547 ../../mod/manage.php:96 ../../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
@@ -53,17 +53,17 @@ msgstr "熟人更新失败。"
 #: ../../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:172
+#: ../../mod/message.php:38 ../../mod/message.php:174
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
 #: ../../mod/display.php:180 ../../mod/profiles.php:146
 #: ../../mod/profiles.php:567 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:15 ../../mod/invite.php:101
+#: ../../mod/suggest.php:56 ../../mod/invite.php:15 ../../mod/invite.php:101
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:512
 #: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170
 #: ../../addon/fbpost/fbpost.php:176
 #: ../../addon/dav/friendica/layout.fnk.php:354
-#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
+#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:4015
 #: ../../index.php:341 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -134,19 +134,20 @@ msgid "New photo from this URL"
 msgstr "新照片从这个URL"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../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:248
+#: ../../mod/events.php:478 ../../mod/photos.php:1075
+#: ../../mod/photos.php:1196 ../../mod/photos.php:1498
+#: ../../mod/photos.php:1549 ../../mod/photos.php:1593
+#: ../../mod/photos.php:1676 ../../mod/install.php:248
 #: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:710 ../../mod/contacts.php:352
+#: ../../mod/content.php:710 ../../mod/contacts.php:386
 #: ../../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:626
-#: ../../mod/invite.php:140 ../../addon/fromgplus/fromgplus.php:44
+#: ../../mod/settings.php:1037 ../../mod/manage.php:110 ../../mod/group.php:87
+#: ../../mod/mood.php:137 ../../mod/message.php:335 ../../mod/message.php:564
+#: ../../mod/admin.php:461 ../../mod/admin.php:728 ../../mod/admin.php:865
+#: ../../mod/admin.php:1068 ../../mod/admin.php:1155
+#: ../../mod/profiles.php:626 ../../mod/invite.php:140
+#: ../../addon/fromgplus/fromgplus.php:44
 #: ../../addon/facebook/facebook.php:621
 #: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/fbpost/fbpost.php:280 ../../addon/yourls/yourls.php:76
@@ -180,7 +181,7 @@ msgstr "新照片从这个URL"
 #: ../../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:191
-#: ../../addon/twitter/twitter.php:229 ../../addon/twitter/twitter.php:554
+#: ../../addon/twitter/twitter.php:229 ../../addon/twitter/twitter.php:556
 #: ../../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
@@ -241,7 +242,7 @@ msgid "Help:"
 msgstr "帮助:"
 
 #: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../include/nav.php:113 ../../addon.old/dav/friendica/layout.fnk.php:225
 msgid "Help"
 msgstr "帮助"
 
@@ -279,87 +280,87 @@ msgstr "建议朋友给%s"
 msgid "Event title and start time are required."
 msgstr "项目标题和开始时间是必须的。"
 
-#: ../../mod/events.php:279
+#: ../../mod/events.php:291
 msgid "l, F j"
 msgstr "l, F j"
 
-#: ../../mod/events.php:301
+#: ../../mod/events.php:313
 msgid "Edit event"
 msgstr "编项目"
 
-#: ../../mod/events.php:323 ../../include/text.php:1246
+#: ../../mod/events.php:335 ../../include/text.php:1258
 msgid "link to source"
 msgstr "链接到来源"
 
-#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1857
+#: ../../mod/events.php:370 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:79 ../../boot.php:1857
 msgid "Events"
 msgstr "事件"
 
-#: ../../mod/events.php:359
+#: ../../mod/events.php:371
 msgid "Create New Event"
 msgstr "造成新的项目"
 
-#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:372 ../../addon/dav/friendica/layout.fnk.php:263
 #: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr "上"
 
-#: ../../mod/events.php:361 ../../mod/install.php:207
+#: ../../mod/events.php:373 ../../mod/install.php:207
 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr "下"
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:446
 msgid "hour:minute"
 msgstr "小时:分钟"
 
-#: ../../mod/events.php:444
+#: ../../mod/events.php:456
 msgid "Event details"
 msgstr "项目内容"
 
-#: ../../mod/events.php:445
+#: ../../mod/events.php:457
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr "形式是%s%s。开始时间和标题是必须的。"
 
-#: ../../mod/events.php:447
+#: ../../mod/events.php:459
 msgid "Event Starts:"
 msgstr "事件开始:"
 
-#: ../../mod/events.php:447 ../../mod/events.php:461
+#: ../../mod/events.php:459 ../../mod/events.php:473
 msgid "Required"
 msgstr "必须的"
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:462
 msgid "Finish date/time is not known or not relevant"
 msgstr "结束日/时未知或无关"
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:464
 msgid "Event Finishes:"
 msgstr "事件结束:"
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:467
 msgid "Adjust for viewer timezone"
 msgstr "调为观众的时间"
 
-#: ../../mod/events.php:457
+#: ../../mod/events.php:469
 msgid "Description:"
 msgstr "描述:"
 
-#: ../../mod/events.php:459 ../../mod/directory.php:134
+#: ../../mod/events.php:471 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415
 #: ../../boot.php:1379
 msgid "Location:"
 msgstr "位置:"
 
-#: ../../mod/events.php:461
+#: ../../mod/events.php:473
 msgid "Title:"
 msgstr "标题:"
 
-#: ../../mod/events.php:463
+#: ../../mod/events.php:475
 msgid "Share this event"
 msgstr "分享这个项目"
 
@@ -367,11 +368,14 @@ msgstr "分享这个项目"
 msgid "System down for maintenance"
 msgstr ""
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1042
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/photos.php:202
+#: ../../mod/photos.php:289 ../../mod/editpost.php:148
+#: ../../mod/dfrn_request.php:848 ../../mod/contacts.php:249
+#: ../../mod/settings.php:561 ../../mod/settings.php:587
+#: ../../mod/fbrowser.php:81 ../../mod/fbrowser.php:116
+#: ../../mod/message.php:212 ../../mod/suggest.php:32
+#: ../../addon/js_upload/js_upload.php:45 ../../include/items.php:3897
+#: ../../include/conversation.php:1062
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "退消"
@@ -394,10 +398,10 @@ msgstr "选择标签去除"
 msgid "Remove"
 msgstr "移走"
 
-#: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530
+#: ../../mod/dfrn_poll.php:101 ../../mod/dfrn_poll.php:534
 #, php-format
 msgid "%1$s welcomes %2$s"
-msgstr ""
+msgstr "%1$s欢迎%2$s"
 
 #: ../../mod/api.php:76 ../../mod/api.php:102
 msgid "Authorize application connection"
@@ -418,14 +422,16 @@ msgid ""
 msgstr "您想不想使这个应用用权您的文章和熟人,和/或代您造成新文章"
 
 #: ../../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:239
-#: ../../mod/profiles.php:606
+#: ../../mod/contacts.php:246 ../../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:239 ../../mod/message.php:209
+#: ../../mod/profiles.php:606 ../../mod/suggest.php:29
+#: ../../include/items.php:3894
 msgid "Yes"
 msgstr "是"
 
@@ -445,16 +451,16 @@ msgstr "否"
 msgid "Photo Albums"
 msgstr "相册"
 
-#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1102 ../../mod/photos.php:1125
-#: ../../mod/photos.php:1626 ../../mod/photos.php:1638
+#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1055
+#: ../../mod/photos.php:1180 ../../mod/photos.php:1203
+#: ../../mod/photos.php:1733 ../../mod/photos.php:1745
 #: ../../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:1141 ../../mod/photos.php:1685
+#: ../../mod/photos.php:66 ../../mod/photos.php:1219 ../../mod/photos.php:1792
 msgid "Upload New Photos"
 msgstr "上传新照片"
 
@@ -466,8 +472,8 @@ msgstr "每人"
 msgid "Contact information unavailable"
 msgstr "熟人信息不可用"
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102
-#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:722 ../../mod/photos.php:1180
+#: ../../mod/photos.php:1203 ../../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
@@ -482,213 +488,247 @@ msgstr "简介照片"
 msgid "Album not found."
 msgstr "取回不了相册."
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1119
+#: ../../mod/photos.php:187 ../../mod/photos.php:199 ../../mod/photos.php:1197
 msgid "Delete Album"
 msgstr "删除相册"
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1403
+#: ../../mod/photos.php:197
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr ""
+
+#: ../../mod/photos.php:275 ../../mod/photos.php:286 ../../mod/photos.php:1499
 msgid "Delete Photo"
 msgstr "删除照片"
 
-#: ../../mod/photos.php:607
+#: ../../mod/photos.php:284
+msgid "Do you really want to delete this photo?"
+msgstr ""
+
+#: ../../mod/photos.php:653
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
-msgstr ""
+msgstr "%1$s被%3$s标签在%2$s"
 
-#: ../../mod/photos.php:607
+#: ../../mod/photos.php:653
 msgid "a photo"
-msgstr ""
+msgstr "一张照片"
 
-#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321
+#: ../../mod/photos.php:758 ../../addon/js_upload/js_upload.php:321
 #: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr "图片超出最大尺寸"
 
-#: ../../mod/photos.php:720
+#: ../../mod/photos.php:766
 msgid "Image file is empty."
 msgstr "图片文件空的。"
 
-#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153
+#: ../../mod/photos.php:798 ../../mod/profile_photo.php:153
 #: ../../mod/wall_upload.php:112
 msgid "Unable to process image."
 msgstr "处理不了图像."
 
-#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301
+#: ../../mod/photos.php:825 ../../mod/profile_photo.php:301
 #: ../../mod/wall_upload.php:138
 msgid "Image upload failed."
 msgstr "图像上载失败了."
 
-#: ../../mod/photos.php:865 ../../mod/community.php:18
+#: ../../mod/photos.php:911 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:19 ../../mod/search.php:89 ../../mod/directory.php:31
 #: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr "公众看拒绝"
 
-#: ../../mod/photos.php:875
+#: ../../mod/photos.php:921
 msgid "No photos selected"
 msgstr "没有照片挑选了"
 
-#: ../../mod/photos.php:976
+#: ../../mod/photos.php:1022
 msgid "Access to this item is restricted."
 msgstr "这个项目使用权限的。"
 
-#: ../../mod/photos.php:1037
+#: ../../mod/photos.php:1085
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr "您用%2$.2f兆字节的%1$.2f兆字节照片存储。"
 
-#: ../../mod/photos.php:1053
+#: ../../mod/photos.php:1120
 msgid "Upload Photos"
 msgstr "上传照片"
 
-#: ../../mod/photos.php:1057 ../../mod/photos.php:1114
+#: ../../mod/photos.php:1124 ../../mod/photos.php:1192
 msgid "New album name: "
 msgstr "新册名:"
 
-#: ../../mod/photos.php:1058
+#: ../../mod/photos.php:1125
 msgid "or existing album name: "
 msgstr "或现有册名"
 
-#: ../../mod/photos.php:1059
+#: ../../mod/photos.php:1126
 msgid "Do not show a status post for this upload"
 msgstr "别显示现状报到关于这个上传"
 
-#: ../../mod/photos.php:1061 ../../mod/photos.php:1398
+#: ../../mod/photos.php:1128 ../../mod/photos.php:1494
 msgid "Permissions"
 msgstr "权利"
 
-#: ../../mod/photos.php:1129
+#: ../../mod/photos.php:1137 ../../mod/photos.php:1503
+#: ../../mod/settings.php:1070
+msgid "Show to Groups"
+msgstr ""
+
+#: ../../mod/photos.php:1138 ../../mod/photos.php:1504
+#: ../../mod/settings.php:1071
+msgid "Show to Contacts"
+msgstr ""
+
+#: ../../mod/photos.php:1139
+msgid "Private Photo"
+msgstr ""
+
+#: ../../mod/photos.php:1140
+msgid "Public Photo"
+msgstr ""
+
+#: ../../mod/photos.php:1207
 msgid "Edit Album"
 msgstr "编照片册"
 
-#: ../../mod/photos.php:1135
+#: ../../mod/photos.php:1213
 msgid "Show Newest First"
 msgstr "先表示最新的"
 
-#: ../../mod/photos.php:1137
+#: ../../mod/photos.php:1215
 msgid "Show Oldest First"
 msgstr "先表示最老的"
 
-#: ../../mod/photos.php:1170 ../../mod/photos.php:1668
+#: ../../mod/photos.php:1248 ../../mod/photos.php:1775
 msgid "View Photo"
 msgstr "看照片"
 
-#: ../../mod/photos.php:1205
+#: ../../mod/photos.php:1283
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "无权利。用这个项目可能受限制。"
 
-#: ../../mod/photos.php:1207
+#: ../../mod/photos.php:1285
 msgid "Photo not available"
 msgstr "照片不可获得的 "
 
-#: ../../mod/photos.php:1263
+#: ../../mod/photos.php:1341
 msgid "View photo"
 msgstr "看照片"
 
-#: ../../mod/photos.php:1263
+#: ../../mod/photos.php:1341
 msgid "Edit photo"
 msgstr "编辑照片"
 
-#: ../../mod/photos.php:1264
+#: ../../mod/photos.php:1342
 msgid "Use as profile photo"
 msgstr "用为资料图"
 
-#: ../../mod/photos.php:1270 ../../mod/content.php:620
+#: ../../mod/photos.php:1348 ../../mod/content.php:620
 #: ../../object/Item.php:106
 msgid "Private Message"
 msgstr "私人的新闻"
 
-#: ../../mod/photos.php:1289
+#: ../../mod/photos.php:1367
 msgid "View Full Size"
 msgstr "看全尺寸"
 
-#: ../../mod/photos.php:1363
+#: ../../mod/photos.php:1441
 msgid "Tags: "
 msgstr "标签:"
 
-#: ../../mod/photos.php:1366
+#: ../../mod/photos.php:1444
 msgid "[Remove any tag]"
 msgstr "[删除任何标签]"
 
-#: ../../mod/photos.php:1388
+#: ../../mod/photos.php:1484
 msgid "Rotate CW (right)"
 msgstr "顺时针地转动(左)"
 
-#: ../../mod/photos.php:1389
+#: ../../mod/photos.php:1485
 msgid "Rotate CCW (left)"
 msgstr "反顺时针地转动(右)"
 
-#: ../../mod/photos.php:1391
+#: ../../mod/photos.php:1487
 msgid "New album name"
 msgstr "新册名"
 
-#: ../../mod/photos.php:1394
+#: ../../mod/photos.php:1490
 msgid "Caption"
 msgstr "字幕"
 
-#: ../../mod/photos.php:1396
+#: ../../mod/photos.php:1492
 msgid "Add a Tag"
 msgstr "加标签"
 
-#: ../../mod/photos.php:1400
+#: ../../mod/photos.php:1496
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "例子:@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv"
 
-#: ../../mod/photos.php:1420 ../../mod/content.php:684
+#: ../../mod/photos.php:1505
+msgid "Private photo"
+msgstr ""
+
+#: ../../mod/photos.php:1506
+msgid "Public photo"
+msgstr ""
+
+#: ../../mod/photos.php:1526 ../../mod/content.php:684
 #: ../../object/Item.php:204
 msgid "I like this (toggle)"
 msgstr "我喜欢这(交替)"
 
-#: ../../mod/photos.php:1421 ../../mod/content.php:685
+#: ../../mod/photos.php:1527 ../../mod/content.php:685
 #: ../../object/Item.php:205
 msgid "I don't like this (toggle)"
 msgstr "我不喜欢这(交替)"
 
-#: ../../mod/photos.php:1422 ../../include/conversation.php:1002
+#: ../../mod/photos.php:1528 ../../include/conversation.php:1023
 msgid "Share"
 msgstr "分享"
 
-#: ../../mod/photos.php:1423 ../../mod/editpost.php:121
+#: ../../mod/photos.php:1529 ../../mod/editpost.php:124
 #: ../../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:1021 ../../object/Item.php:293
+#: ../../mod/wallmessage.php:156 ../../mod/message.php:334
+#: ../../mod/message.php:565 ../../include/conversation.php:646
+#: ../../include/conversation.php:1042 ../../object/Item.php:293
 msgid "Please wait"
 msgstr "请等一下"
 
-#: ../../mod/photos.php:1439 ../../mod/photos.php:1483
-#: ../../mod/photos.php:1566 ../../mod/content.php:707
+#: ../../mod/photos.php:1546 ../../mod/photos.php:1590
+#: ../../mod/photos.php:1673 ../../mod/content.php:707
 #: ../../object/Item.php:601
 msgid "This is you"
 msgstr "这是你"
 
-#: ../../mod/photos.php:1441 ../../mod/photos.php:1485
-#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:641
+#: ../../mod/photos.php:1548 ../../mod/photos.php:1592
+#: ../../mod/photos.php:1675 ../../mod/content.php:709 ../../boot.php:641
 #: ../../object/Item.php:290 ../../object/Item.php:603
 msgid "Comment"
 msgstr "评论"
 
-#: ../../mod/photos.php:1443 ../../mod/photos.php:1487
-#: ../../mod/photos.php:1570 ../../mod/editpost.php:142
-#: ../../mod/content.php:719 ../../include/conversation.php:1039
+#: ../../mod/photos.php:1550 ../../mod/photos.php:1594
+#: ../../mod/photos.php:1677 ../../mod/editpost.php:145
+#: ../../mod/content.php:719 ../../include/conversation.php:1059
 #: ../../object/Item.php:613
 msgid "Preview"
 msgstr "预演"
 
-#: ../../mod/photos.php:1527 ../../mod/content.php:439
+#: ../../mod/photos.php:1634 ../../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:120
+#: ../../include/conversation.php:570 ../../object/Item.php:120
 msgid "Delete"
 msgstr "删除"
 
-#: ../../mod/photos.php:1674
+#: ../../mod/photos.php:1781
 msgid "View Album"
 msgstr "看照片册"
 
-#: ../../mod/photos.php:1683
+#: ../../mod/photos.php:1790
 msgid "Recent Photos"
 msgstr "最近的照片"
 
@@ -697,7 +737,7 @@ msgid "Not available."
 msgstr "不可用的"
 
 #: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
-#: ../../include/nav.php:101
+#: ../../include/nav.php:128
 msgid "Community"
 msgstr "社会"
 
@@ -746,96 +786,92 @@ msgstr "项目没找到"
 msgid "Edit post"
 msgstr "编辑文章"
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:988
-msgid "Post to Email"
-msgstr "电邮发布"
-
-#: ../../mod/editpost.php:106 ../../mod/content.php:728
+#: ../../mod/editpost.php:109 ../../mod/content.php:728
 #: ../../mod/settings.php:622 ../../object/Item.php:110
 msgid "Edit"
 msgstr "编辑"
 
-#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:298 ../../mod/message.php:525
-#: ../../include/conversation.php:1003
+#: ../../mod/editpost.php:110 ../../mod/wallmessage.php:154
+#: ../../mod/message.php:332 ../../mod/message.php:562
+#: ../../include/conversation.php:1024
 msgid "Upload photo"
 msgstr "上传照片"
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:1004
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1025
 msgid "upload photo"
 msgstr "上传照片"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:1005
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1026
 msgid "Attach file"
 msgstr "附上文件"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1006
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1027
 msgid "attach file"
 msgstr "附上文件"
 
-#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:299 ../../mod/message.php:526
-#: ../../include/conversation.php:1007
+#: ../../mod/editpost.php:114 ../../mod/wallmessage.php:155
+#: ../../mod/message.php:333 ../../mod/message.php:563
+#: ../../include/conversation.php:1028
 msgid "Insert web link"
 msgstr "插入网页环节"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:1008
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1029
 msgid "web link"
 msgstr "网页环节"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1009
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1030
 msgid "Insert video link"
 msgstr "插入视频环节"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:1010
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1031
 msgid "video link"
 msgstr "视频环节"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:1011
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1032
 msgid "Insert audio link"
 msgstr "插入录音环节"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:1012
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1033
 msgid "audio link"
 msgstr "录音环节"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1013
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1034
 msgid "Set your location"
 msgstr "设定您的位置"
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:1014
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1035
 msgid "set location"
 msgstr "指定位置"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1015
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1036
 msgid "Clear browser location"
 msgstr "清空浏览器位置"
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1016
+#: ../../mod/editpost.php:123 ../../include/conversation.php:1037
 msgid "clear location"
 msgstr "清理出位置"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1022
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1043
 msgid "Permission settings"
 msgstr "权设置"
 
-#: ../../mod/editpost.php:130 ../../include/conversation.php:1031
+#: ../../mod/editpost.php:133 ../../include/conversation.php:1052
 msgid "CC: email addresses"
 msgstr "抄送: 电子邮件地址"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:1032
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1053
 msgid "Public post"
 msgstr "公开的消息"
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:1018
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1039
 msgid "Set title"
 msgstr "指定标题"
 
-#: ../../mod/editpost.php:136 ../../include/conversation.php:1020
+#: ../../mod/editpost.php:139 ../../include/conversation.php:1041
 msgid "Categories (comma-separated list)"
 msgstr "种类(逗号分隔单)"
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1034
+#: ../../mod/editpost.php:140 ../../include/conversation.php:1055
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "比如: li@example.com, wang@example.com"
 
@@ -1027,7 +1063,7 @@ msgstr "您的同一个人地址:"
 msgid "Submit Request"
 msgstr "提交要求"
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:167
 msgid "Account settings"
 msgstr "帐户配置"
 
@@ -1056,10 +1092,10 @@ msgid "Remove account"
 msgstr "删除账户"
 
 #: ../../mod/uexport.php:48 ../../mod/settings.php:74
-#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
+#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1033
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:167
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1067,24 +1103,24 @@ msgstr "配置"
 
 #: ../../mod/uexport.php:72
 msgid "Export account"
-msgstr ""
+msgstr "出口账户"
 
 #: ../../mod/uexport.php:72
 msgid ""
 "Export your account info and contacts. Use this to make a backup of your "
 "account and/or to move it to another server."
-msgstr ""
+msgstr "出口您的商户信息和熟人。这利于备份您的账户活着搬到别的服务器。"
 
 #: ../../mod/uexport.php:73
 msgid "Export all"
-msgstr ""
+msgstr "出口一切"
 
 #: ../../mod/uexport.php:73
 msgid ""
 "Export your accout info, contacts and all your items as json. Could be a "
 "very big file, and could take a lot of time. Use this to make a full backup "
 "of your account (photos are not exported)"
-msgstr ""
+msgstr "出口您账户信息,熟人和别的项目成json。可能是很大文件,花很多时间。用这个为创造全备份您的账户(照片没被出口)"
 
 #: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
@@ -1382,7 +1418,7 @@ msgstr "时间装换"
 msgid ""
 "Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
-msgstr ""
+msgstr "Friendica提供这个服务目的是分享项目跟别的网络和朋友们在别的时区。"
 
 #: ../../mod/localtime.php:30
 #, php-format
@@ -1435,7 +1471,7 @@ msgstr "没有符合的关键字。请在您的默认简介加关键字。"
 msgid "is interested in:"
 msgstr "感兴趣对:"
 
-#: ../../mod/match.php:58 ../../mod/suggest.php:59
+#: ../../mod/match.php:58 ../../mod/suggest.php:88
 #: ../../include/contact_widgets.php:9 ../../boot.php:1317
 msgid "Connect"
 msgstr "连接"
@@ -1453,37 +1489,37 @@ msgstr "摇隐私信息无效"
 msgid "Visible to:"
 msgstr "可见给:"
 
-#: ../../mod/content.php:119 ../../mod/network.php:594
+#: ../../mod/content.php:119 ../../mod/network.php:596
 msgid "No such group"
 msgstr "没有这个组"
 
-#: ../../mod/content.php:130 ../../mod/network.php:605
+#: ../../mod/content.php:130 ../../mod/network.php:607
 msgid "Group is empty"
 msgstr "组没有成员"
 
-#: ../../mod/content.php:134 ../../mod/network.php:609
+#: ../../mod/content.php:134 ../../mod/network.php:611
 msgid "Group: "
 msgstr "组:"
 
 #: ../../mod/content.php:438 ../../mod/content.php:740
-#: ../../include/conversation.php:568 ../../object/Item.php:119
+#: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Select"
 msgstr "选择"
 
 #: ../../mod/content.php:472 ../../mod/content.php:852
-#: ../../mod/content.php:853 ../../include/conversation.php:608
+#: ../../mod/content.php:853 ../../include/conversation.php:609
 #: ../../object/Item.php:258 ../../object/Item.php:259
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "看%s的简介@ %s"
 
 #: ../../mod/content.php:482 ../../mod/content.php:864
-#: ../../include/conversation.php:628 ../../object/Item.php:272
+#: ../../include/conversation.php:629 ../../object/Item.php:272
 #, php-format
 msgid "%s from %s"
 msgstr "%s从%s"
 
-#: ../../mod/content.php:497 ../../include/conversation.php:643
+#: ../../mod/content.php:497 ../../include/conversation.php:644
 msgid "View in context"
 msgstr "看在上下文"
 
@@ -1493,7 +1529,7 @@ msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d评论"
 
-#: ../../mod/content.php:605 ../../include/text.php:1502
+#: ../../mod/content.php:605 ../../include/text.php:1514
 #: ../../object/Item.php:315 ../../object/Item.php:328
 msgid "comment"
 msgid_plural "comments"
@@ -1607,8 +1643,8 @@ msgid "Discard"
 msgstr "丢弃"
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210 ../../mod/contacts.php:325
-#: ../../mod/contacts.php:379
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:359
+#: ../../mod/contacts.php:413
 msgid "Ignore"
 msgstr "忽视"
 
@@ -1616,7 +1652,7 @@ msgstr "忽视"
 msgid "System"
 msgstr "系统"
 
-#: ../../mod/notifications.php:83 ../../include/nav.php:113
+#: ../../mod/notifications.php:83 ../../include/nav.php:140
 msgid "Network"
 msgstr "网络"
 
@@ -1625,16 +1661,16 @@ msgid "Personal"
 msgstr "私人"
 
 #: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
-#: ../../include/nav.php:77 ../../include/nav.php:116
+#: ../../include/nav.php:104 ../../include/nav.php:143
 msgid "Home"
 msgstr "主页"
 
-#: ../../mod/notifications.php:98 ../../include/nav.php:122
+#: ../../mod/notifications.php:98 ../../include/nav.php:149
 msgid "Introductions"
 msgstr "介绍"
 
-#: ../../mod/notifications.php:103 ../../mod/message.php:180
-#: ../../include/nav.php:129
+#: ../../mod/notifications.php:103 ../../mod/message.php:182
+#: ../../include/nav.php:156
 msgid "Messages"
 msgstr "消息"
 
@@ -1660,7 +1696,7 @@ msgid "suggested by %s"
 msgstr "由%s建议的"
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/contacts.php:385
+#: ../../mod/contacts.php:419
 msgid "Hide this contact from others"
 msgstr "隐藏这个熟人给别人"
 
@@ -1717,7 +1753,7 @@ msgstr "新关注者:"
 msgid "No introductions."
 msgstr "没有介绍。"
 
-#: ../../mod/notifications.php:220 ../../include/nav.php:123
+#: ../../mod/notifications.php:220 ../../include/nav.php:150
 msgid "Notifications"
 msgstr "通知"
 
@@ -1818,271 +1854,275 @@ msgstr "把联系存档了"
 msgid "Contact has been unarchived"
 msgstr "把联系从存档拿来了"
 
-#: ../../mod/contacts.php:233
+#: ../../mod/contacts.php:244
+msgid "Do you really want to delete this contact?"
+msgstr ""
+
+#: ../../mod/contacts.php:263
 msgid "Contact has been removed."
 msgstr "熟人删除了。"
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:301
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "您和%s是共同朋友们"
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:305
 #, php-format
 msgid "You are sharing with %s"
 msgstr "您分享给%s"
 
-#: ../../mod/contacts.php:276
+#: ../../mod/contacts.php:310
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s给您分享"
 
-#: ../../mod/contacts.php:293
+#: ../../mod/contacts.php:327
 msgid "Private communications are not available for this contact."
 msgstr "没有私人的沟通跟这个熟人"
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:330
 msgid "Never"
 msgstr "从未"
 
-#: ../../mod/contacts.php:300
+#: ../../mod/contacts.php:334
 msgid "(Update was successful)"
 msgstr "(更新成功)"
 
-#: ../../mod/contacts.php:300
+#: ../../mod/contacts.php:334
 msgid "(Update was not successful)"
 msgstr "(更新不成功)"
 
-#: ../../mod/contacts.php:302
+#: ../../mod/contacts.php:336
 msgid "Suggest friends"
 msgstr "建议朋友们"
 
-#: ../../mod/contacts.php:306
+#: ../../mod/contacts.php:340
 #, php-format
 msgid "Network type: %s"
 msgstr "网络种类: %s"
 
-#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199
+#: ../../mod/contacts.php:343 ../../include/contact_widgets.php:199
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d共同熟人"
 
-#: ../../mod/contacts.php:314
+#: ../../mod/contacts.php:348
 msgid "View all contacts"
 msgstr "看所有的熟人"
 
-#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
 #: ../../mod/admin.php:737
 msgid "Unblock"
 msgstr "不拦"
 
-#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/contacts.php:353 ../../mod/contacts.php:412
 #: ../../mod/admin.php:736
 msgid "Block"
 msgstr "拦"
 
-#: ../../mod/contacts.php:322
+#: ../../mod/contacts.php:356
 msgid "Toggle Blocked status"
 msgstr "交替拦配置"
 
-#: ../../mod/contacts.php:325 ../../mod/contacts.php:379
+#: ../../mod/contacts.php:359 ../../mod/contacts.php:413
 msgid "Unignore"
 msgstr "停不理"
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:362
 msgid "Toggle Ignored status"
 msgstr "交替忽视现状"
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:366
 msgid "Unarchive"
 msgstr "从存档拿来"
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:366
 msgid "Archive"
 msgstr "存档"
 
-#: ../../mod/contacts.php:335
+#: ../../mod/contacts.php:369
 msgid "Toggle Archive status"
 msgstr "交替档案现状"
 
-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:372
 msgid "Repair"
 msgstr "维修"
 
-#: ../../mod/contacts.php:341
+#: ../../mod/contacts.php:375
 msgid "Advanced Contact Settings"
 msgstr "专家熟人设置"
 
-#: ../../mod/contacts.php:347
+#: ../../mod/contacts.php:381
 msgid "Communications lost with this contact!"
 msgstr "联系跟这个熟人断开了!"
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:384
 msgid "Contact Editor"
 msgstr "熟人编器"
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:387
 msgid "Profile Visibility"
 msgstr "简历可见量"
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:388
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "请选择简介您想给%s显示他安全地看您的简介的时候。"
 
-#: ../../mod/contacts.php:355
+#: ../../mod/contacts.php:389
 msgid "Contact Information / Notes"
 msgstr "熟人信息/便条"
 
-#: ../../mod/contacts.php:356
+#: ../../mod/contacts.php:390
 msgid "Edit contact notes"
 msgstr "编辑熟人便条"
 
-#: ../../mod/contacts.php:361 ../../mod/contacts.php:553
+#: ../../mod/contacts.php:395 ../../mod/contacts.php:585
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "看%s的简介[%s]"
 
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:396
 msgid "Block/Unblock contact"
 msgstr "拦/否拦熟人"
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:397
 msgid "Ignore contact"
 msgstr "忽视熟人"
 
-#: ../../mod/contacts.php:364
+#: ../../mod/contacts.php:398
 msgid "Repair URL settings"
 msgstr "维修URL设置"
 
-#: ../../mod/contacts.php:365
+#: ../../mod/contacts.php:399
 msgid "View conversations"
 msgstr "看交流"
 
-#: ../../mod/contacts.php:367
+#: ../../mod/contacts.php:401
 msgid "Delete contact"
 msgstr "删除熟人"
 
-#: ../../mod/contacts.php:371
+#: ../../mod/contacts.php:405
 msgid "Last update:"
 msgstr "上个更新:"
 
-#: ../../mod/contacts.php:373
+#: ../../mod/contacts.php:407
 msgid "Update public posts"
 msgstr "更新公开文章"
 
-#: ../../mod/contacts.php:375 ../../mod/admin.php:1209
+#: ../../mod/contacts.php:409 ../../mod/admin.php:1213
 msgid "Update now"
 msgstr "现在更新"
 
-#: ../../mod/contacts.php:382
+#: ../../mod/contacts.php:416
 msgid "Currently blocked"
 msgstr "现在拦的"
 
-#: ../../mod/contacts.php:383
+#: ../../mod/contacts.php:417
 msgid "Currently ignored"
 msgstr "现在不理的"
 
-#: ../../mod/contacts.php:384
+#: ../../mod/contacts.php:418
 msgid "Currently archived"
 msgstr "现在存档着"
 
-#: ../../mod/contacts.php:385
+#: ../../mod/contacts.php:419
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "回答/喜欢关您公开文章<strong>会</strong>还可见的"
 
-#: ../../mod/contacts.php:438
+#: ../../mod/contacts.php:470
 msgid "Suggestions"
 msgstr "建议"
 
-#: ../../mod/contacts.php:441
+#: ../../mod/contacts.php:473
 msgid "Suggest potential friends"
 msgstr "建议潜在朋友们"
 
-#: ../../mod/contacts.php:444 ../../mod/group.php:194
+#: ../../mod/contacts.php:476 ../../mod/group.php:194
 msgid "All Contacts"
 msgstr "所有的熟人"
 
-#: ../../mod/contacts.php:447
+#: ../../mod/contacts.php:479
 msgid "Show all contacts"
 msgstr "表示所有的熟人"
 
-#: ../../mod/contacts.php:450
+#: ../../mod/contacts.php:482
 msgid "Unblocked"
 msgstr "不拦了"
 
-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:485
 msgid "Only show unblocked contacts"
 msgstr "只表示不拦的熟人"
 
-#: ../../mod/contacts.php:457
+#: ../../mod/contacts.php:489
 msgid "Blocked"
 msgstr "拦了"
 
-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:492
 msgid "Only show blocked contacts"
 msgstr "只表示拦的熟人"
 
-#: ../../mod/contacts.php:464
+#: ../../mod/contacts.php:496
 msgid "Ignored"
 msgstr "忽视的"
 
-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:499
 msgid "Only show ignored contacts"
 msgstr "只表示忽视的熟人"
 
-#: ../../mod/contacts.php:471
+#: ../../mod/contacts.php:503
 msgid "Archived"
 msgstr "在存档"
 
-#: ../../mod/contacts.php:474
+#: ../../mod/contacts.php:506
 msgid "Only show archived contacts"
 msgstr "只表示档案熟人"
 
-#: ../../mod/contacts.php:478
+#: ../../mod/contacts.php:510
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:513
 msgid "Only show hidden contacts"
 msgstr "只表示隐藏的熟人"
 
-#: ../../mod/contacts.php:529
+#: ../../mod/contacts.php:561
 msgid "Mutual Friendship"
 msgstr "共同友谊"
 
-#: ../../mod/contacts.php:533
+#: ../../mod/contacts.php:565
 msgid "is a fan of yours"
 msgstr "是您迷"
 
-#: ../../mod/contacts.php:537
+#: ../../mod/contacts.php:569
 msgid "you are a fan of"
 msgstr "你喜欢"
 
-#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:586 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "编熟人"
 
-#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:144
+#: ../../mod/contacts.php:607 ../../view/theme/diabook/theme.php:89
+#: ../../include/nav.php:171
 msgid "Contacts"
 msgstr "熟人"
 
-#: ../../mod/contacts.php:579
+#: ../../mod/contacts.php:611
 msgid "Search your contacts"
 msgstr "搜索您的熟人"
 
-#: ../../mod/contacts.php:580 ../../mod/directory.php:59
+#: ../../mod/contacts.php:612 ../../mod/directory.php:59
 #: ../../addon/forumdirectory/forumdirectory.php:81
 msgid "Finding: "
 msgstr "找着:"
 
-#: ../../mod/contacts.php:581 ../../mod/directory.php:61
+#: ../../mod/contacts.php:613 ../../mod/directory.php:61
 #: ../../addon/forumdirectory/forumdirectory.php:83
 #: ../../include/contact_widgets.php:33
 msgid "Find"
@@ -2158,7 +2198,7 @@ msgstr "复位"
 
 #: ../../mod/settings.php:35
 msgid "Additional features"
-msgstr ""
+msgstr "附加的特点"
 
 #: ../../mod/settings.php:118
 msgid "Missing some important data!"
@@ -2178,7 +2218,7 @@ msgstr "电子邮件设置更新了"
 
 #: ../../mod/settings.php:247
 msgid "Features updated"
-msgstr ""
+msgstr "特点更新了"
 
 #: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
@@ -2226,7 +2266,7 @@ msgstr "私人评坛没有隐私批准或默认隐私组。"
 #: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:104
 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:548
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:550
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2292,15 +2332,15 @@ msgstr "插件设置"
 
 #: ../../mod/settings.php:660
 msgid "Off"
-msgstr ""
+msgstr ""
 
 #: ../../mod/settings.php:660
 msgid "On"
-msgstr ""
+msgstr ""
 
 #: ../../mod/settings.php:668
 msgid "Additional Features"
-msgstr ""
+msgstr "附加的特点"
 
 #: ../../mod/settings.php:681 ../../mod/settings.php:682
 #, php-format
@@ -2557,149 +2597,161 @@ msgstr "把照片过期:"
 msgid "Only expire posts by others:"
 msgstr "只别人的文章过期:"
 
-#: ../../mod/settings.php:1016
+#: ../../mod/settings.php:1035
 msgid "Account Settings"
 msgstr "帐户设置"
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1043
 msgid "Password Settings"
 msgstr "密码设置"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1044
 msgid "New Password:"
 msgstr "新密码:"
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1045
 msgid "Confirm:"
 msgstr "确认:"
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1045
 msgid "Leave password fields blank unless changing"
 msgstr "非变化留空密码栏"
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1049
 msgid "Basic Settings"
 msgstr "基础设置"
 
-#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1050 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1051
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1052
 msgid "Your Timezone:"
 msgstr "您的时区:"
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1053
 msgid "Default Post Location:"
 msgstr "默认文章位置:"
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1054
 msgid "Use Browser Location:"
 msgstr "用游览器位置:"
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1057
 msgid "Security and Privacy Settings"
 msgstr "安全和隐私设置"
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1059
 msgid "Maximum Friend Requests/Day:"
 msgstr "最多友谊要求个天:"
 
-#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
+#: ../../mod/settings.php:1059 ../../mod/settings.php:1089
 msgid "(to prevent spam abuse)"
 msgstr "(为防止垃圾邮件滥用)"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1060
 msgid "Default Post Permissions"
 msgstr "默认文章准许"
 
-#: ../../mod/settings.php:1042
+#: ../../mod/settings.php:1061
 msgid "(click to open/close)"
 msgstr "(点击为打开/关闭)"
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1072
+msgid "Default Private Post"
+msgstr ""
+
+#: ../../mod/settings.php:1073
+msgid "Default Public Post"
+msgstr ""
+
+#: ../../mod/settings.php:1077
+msgid "Default Permissions for New Posts"
+msgstr ""
+
+#: ../../mod/settings.php:1089
 msgid "Maximum private messages per day from unknown people:"
 msgstr "一天最多从生人私人邮件:"
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1092
 msgid "Notification Settings"
 msgstr "消息设置"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1093
 msgid "By default post a status message when:"
 msgstr "默认地发现状通知如果:"
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1094
 msgid "accepting a friend request"
 msgstr "接受朋友邀请"
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1095
 msgid "joining a forum/community"
 msgstr "加入评坛/社会"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1096
 msgid "making an <em>interesting</em> profile change"
 msgstr "把简介有意思地变修改"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1097
 msgid "Send a notification email when:"
 msgstr "发一个消息要是:"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1098
 msgid "You receive an introduction"
 msgstr "你受到一个介绍"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1099
 msgid "Your introductions are confirmed"
 msgstr "你的介绍确认了"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1100
 msgid "Someone writes on your profile wall"
 msgstr "某人写在你的简历墙"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1101
 msgid "Someone writes a followup comment"
 msgstr "某人写一个后续的评论"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1102
 msgid "You receive a private message"
 msgstr "你受到一个私消息"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1103
 msgid "You receive a friend suggestion"
 msgstr "你受到一个朋友建议"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1104
 msgid "You are tagged in a post"
 msgstr "你被在新闻标签"
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1105
 msgid "You are poked/prodded/etc. in a post"
 msgstr "您在文章被戳"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1108
 msgid "Advanced Account/Page Type Settings"
 msgstr "专家账户/页种设置"
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1109
 msgid "Change the behaviour of this account for special situations"
 msgstr "把这个账户特别情况的时候行动变化"
 
-#: ../../mod/manage.php:94
+#: ../../mod/manage.php:106
 msgid "Manage Identities and/or Pages"
 msgstr "管理身份或页"
 
-#: ../../mod/manage.php:97
+#: ../../mod/manage.php:107
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
 msgstr "交替不同同一人或社会/组页合用您的账户或给您「管理」批准"
 
-#: ../../mod/manage.php:99
+#: ../../mod/manage.php:108
 msgid "Select an identity to manage: "
 msgstr "选择同一个人管理:"
 
@@ -2775,15 +2827,15 @@ msgstr[0] "警告:这个组包括%s成员从不安全网络。"
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "私人通信给这组回被公开。"
 
-#: ../../mod/network.php:619
+#: ../../mod/network.php:621
 msgid "Contact: "
 msgstr "熟人:"
 
-#: ../../mod/network.php:621
+#: ../../mod/network.php:623
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "私人通信给这个人回被公开。"
 
-#: ../../mod/network.php:626
+#: ../../mod/network.php:628
 msgid "Invalid contact."
 msgstr "无效熟人。"
 
@@ -2813,11 +2865,11 @@ msgstr "这个网站超过一天最多账户注册。请明天再试。"
 
 #: ../../mod/uimport.php:64
 msgid "Import"
-msgstr ""
+msgstr "进口"
 
 #: ../../mod/uimport.php:66
 msgid "Move account"
-msgstr ""
+msgstr "把账户搬出"
 
 #: ../../mod/uimport.php:67
 msgid "You can import an account from another Friendica server."
@@ -2838,13 +2890,13 @@ msgstr ""
 
 #: ../../mod/uimport.php:70
 msgid "Account file"
-msgstr ""
+msgstr "账户文件"
 
 #: ../../mod/uimport.php:70
 msgid ""
 "To export your accont, go to \"Settings->Export your porsonal data\" and "
 "select \"Export account\""
-msgstr ""
+msgstr "为出口您账户,点击「设置→出口您私人信息」和选择「出口账户」"
 
 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
 #, php-format
@@ -2875,36 +2927,36 @@ msgstr "消息发了"
 msgid "No recipient."
 msgstr "没有接受者。"
 
-#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
-#: ../../mod/message.php:249 ../../mod/message.php:257
-#: ../../mod/message.php:429 ../../mod/message.php:437
-#: ../../include/conversation.php:938 ../../include/conversation.php:956
+#: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
+#: ../../mod/message.php:283 ../../mod/message.php:291
+#: ../../mod/message.php:466 ../../mod/message.php:474
+#: ../../include/conversation.php:940 ../../include/conversation.php:958
 msgid "Please enter a link URL:"
 msgstr "请输入环节URL:"
 
-#: ../../mod/wallmessage.php:138 ../../mod/message.php:285
+#: ../../mod/wallmessage.php:142 ../../mod/message.php:319
 msgid "Send Private Message"
 msgstr "发私人的通信"
 
-#: ../../mod/wallmessage.php:139
+#: ../../mod/wallmessage.php:143
 #, php-format
 msgid ""
 "If you wish for %s to respond, please check that the privacy settings on "
 "your site allow private mail from unknown senders."
 msgstr "如果您想%s回答,请核对您网站的隐私设置允许生发送人的私人邮件。"
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:286
-#: ../../mod/message.php:516
+#: ../../mod/wallmessage.php:144 ../../mod/message.php:320
+#: ../../mod/message.php:553
 msgid "To:"
 msgstr "到:"
 
-#: ../../mod/wallmessage.php:141 ../../mod/message.php:291
-#: ../../mod/message.php:518
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:325
+#: ../../mod/message.php:555
 msgid "Subject:"
 msgstr "题目:"
 
-#: ../../mod/wallmessage.php:147 ../../mod/message.php:295
-#: ../../mod/message.php:521 ../../mod/invite.php:134
+#: ../../mod/wallmessage.php:151 ../../mod/message.php:329
+#: ../../mod/message.php:558 ../../mod/invite.php:134
 msgid "Your message:"
 msgstr "你的消息:"
 
@@ -2960,7 +3012,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
+#: ../../include/profile_advanced.php:84 ../../include/nav.php:77
 #: ../../boot.php:1840
 msgid "Profile"
 msgstr "简介"
@@ -3266,7 +3318,7 @@ msgstr "选择简介昵称。昵称头一字必须拉丁字。您再这个网站
 msgid "Choose a nickname: "
 msgstr "选择昵称:"
 
-#: ../../mod/register.php:275 ../../include/nav.php:81 ../../boot.php:1012
+#: ../../mod/register.php:275 ../../include/nav.php:108 ../../boot.php:1012
 msgid "Register"
 msgstr "注册"
 
@@ -3274,40 +3326,40 @@ msgstr "注册"
 msgid "People Search"
 msgstr "搜索人物"
 
-#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
+#: ../../mod/like.php:151 ../../mod/subthread.php:87 ../../mod/tagger.php:62
 #: ../../addon/communityhome/communityhome.php:171
-#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1498
-#: ../../include/diaspora.php:1860 ../../include/conversation.php:125
-#: ../../include/conversation.php:253
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1510
+#: ../../include/diaspora.php:1860 ../../include/conversation.php:126
+#: ../../include/conversation.php:254
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
 msgstr "照片"
 
-#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
+#: ../../mod/like.php:151 ../../mod/like.php:322 ../../mod/subthread.php:87
 #: ../../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:1860
-#: ../../include/conversation.php:120 ../../include/conversation.php:129
-#: ../../include/conversation.php:248 ../../include/conversation.php:257
+#: ../../include/conversation.php:121 ../../include/conversation.php:130
+#: ../../include/conversation.php:249 ../../include/conversation.php:258
 #: ../../addon.old/facebook/facebook.php:1598
 #: ../../addon.old/communityhome/communityhome.php:158
 #: ../../addon.old/communityhome/communityhome.php:167
 msgid "status"
 msgstr "现状"
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604
+#: ../../mod/like.php:168 ../../addon/facebook/facebook.php:1604
 #: ../../addon/communityhome/communityhome.php:180
 #: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1876
-#: ../../include/conversation.php:136
+#: ../../include/conversation.php:137
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s喜欢%2$s的%3$s"
 
-#: ../../mod/like.php:164 ../../include/conversation.php:139
+#: ../../mod/like.php:170 ../../include/conversation.php:140
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s不喜欢%2$s的%3$s"
@@ -3323,7 +3375,7 @@ msgid "Access denied."
 msgstr "没有用权。"
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1847
+#: ../../include/nav.php:78 ../../boot.php:1847
 msgid "Photos"
 msgstr "照片"
 
@@ -3348,44 +3400,44 @@ msgstr "清登录。"
 msgid "Unable to locate original post."
 msgstr "找不到当初的新闻"
 
-#: ../../mod/item.php:288
+#: ../../mod/item.php:292
 msgid "Empty post discarded."
 msgstr "空心的新闻丢弃了"
 
-#: ../../mod/item.php:424 ../../mod/wall_upload.php:135
+#: ../../mod/item.php:428 ../../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:837
+#: ../../mod/item.php:841
 msgid "System error. Post not saved."
 msgstr "系统错误。x"
 
-#: ../../mod/item.php:862
+#: ../../mod/item.php:866
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "这个新闻是由%s,Friendica社会化网络成员之一,发给你。"
 
-#: ../../mod/item.php:864
+#: ../../mod/item.php:868
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "你可以网上拜访他在%s"
 
-#: ../../mod/item.php:865
+#: ../../mod/item.php:869
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "你不想受到这些新闻的话,请回答这个新闻给发者联系。"
 
-#: ../../mod/item.php:867
+#: ../../mod/item.php:871
 #, php-format
 msgid "%s posted an update."
 msgstr "%s贴上一个新闻。"
 
-#: ../../mod/mood.php:62 ../../include/conversation.php:226
+#: ../../mod/mood.php:62 ../../include/conversation.php:227
 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr "%1$s现在是%2$s"
@@ -3479,7 +3531,15 @@ msgstr "这要完全删除您的账户。这一做过,就不能恢复。"
 msgid "Please enter your password for verification:"
 msgstr "请输入密码为确认:"
 
-#: ../../mod/message.php:9 ../../include/nav.php:132
+#: ../../mod/navigation.php:20 ../../include/nav.php:34
+msgid "Nothing new here"
+msgstr "这里没有什么新的"
+
+#: ../../mod/navigation.php:24 ../../include/nav.php:38
+msgid "Clear notifications"
+msgstr ""
+
+#: ../../mod/message.php:9 ../../include/nav.php:159
 msgid "New Message"
 msgstr "新的消息"
 
@@ -3487,62 +3547,66 @@ msgstr "新的消息"
 msgid "Unable to locate contact information."
 msgstr "找不到熟人信息。"
 
-#: ../../mod/message.php:195
+#: ../../mod/message.php:207
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#: ../../mod/message.php:227
 msgid "Message deleted."
 msgstr "消息删除了。"
 
-#: ../../mod/message.php:225
+#: ../../mod/message.php:258
 msgid "Conversation removed."
 msgstr "交流删除了。"
 
-#: ../../mod/message.php:334
+#: ../../mod/message.php:371
 msgid "No messages."
 msgstr "没有消息"
 
-#: ../../mod/message.php:341
+#: ../../mod/message.php:378
 #, php-format
 msgid "Unknown sender - %s"
 msgstr "生发送人-%s"
 
-#: ../../mod/message.php:344
+#: ../../mod/message.php:381
 #, php-format
 msgid "You and %s"
 msgstr "您和%s"
 
-#: ../../mod/message.php:347
+#: ../../mod/message.php:384
 #, php-format
 msgid "%s and You"
 msgstr "%s和您"
 
-#: ../../mod/message.php:368 ../../mod/message.php:509
+#: ../../mod/message.php:405 ../../mod/message.php:546
 msgid "Delete conversation"
 msgstr "删除交谈"
 
-#: ../../mod/message.php:371
+#: ../../mod/message.php:408
 msgid "D, d M Y - g:i A"
 msgstr "D, d M Y - g:i A"
 
-#: ../../mod/message.php:374
+#: ../../mod/message.php:411
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d通知"
 
-#: ../../mod/message.php:413
+#: ../../mod/message.php:450
 msgid "Message not available."
 msgstr "通信不可用的"
 
-#: ../../mod/message.php:483
+#: ../../mod/message.php:520
 msgid "Delete message"
 msgstr "删除消息"
 
-#: ../../mod/message.php:511
+#: ../../mod/message.php:548
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "没可用的安全交通。您<strong>可能</strong>会在发送人的简介页会回答。"
 
-#: ../../mod/message.php:515
+#: ../../mod/message.php:552
 msgid "Send Reply"
 msgstr "发回答"
 
@@ -3571,7 +3635,7 @@ msgstr "用户"
 msgid "Plugins"
 msgstr "插件"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:1027 ../../mod/admin.php:1063
+#: ../../mod/admin.php:99 ../../mod/admin.php:1031 ../../mod/admin.php:1067
 msgid "Themes"
 msgstr "主题"
 
@@ -3579,11 +3643,11 @@ msgstr "主题"
 msgid "DB updates"
 msgstr "数据库更新"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1150
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1154
 msgid "Logs"
 msgstr "记录"
 
-#: ../../mod/admin.php:120 ../../include/nav.php:151
+#: ../../mod/admin.php:120 ../../include/nav.php:178
 msgid "Admin"
 msgstr "管理"
 
@@ -3624,8 +3688,8 @@ msgid "Message queues"
 msgstr "通知排队"
 
 #: ../../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
+#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1030
+#: ../../mod/admin.php:1066 ../../mod/admin.php:1153
 msgid "Administration"
 msgstr "管理"
 
@@ -3869,7 +3933,7 @@ msgstr "新用户默认写私人文章"
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
-msgstr ""
+msgstr "默认新用户文章批准使默认隐私组,没有公开。"
 
 #: ../../mod/admin.php:493
 msgid "Block multiple registrations"
@@ -4136,7 +4200,7 @@ msgstr "否定"
 
 #: ../../mod/admin.php:738
 msgid "Site admin"
-msgstr ""
+msgstr "网站管理员"
 
 #: ../../mod/admin.php:741
 msgid "Register date"
@@ -4176,23 +4240,23 @@ msgstr "使插件%s不能用。"
 msgid "Plugin %s enabled."
 msgstr "使插件%s能用。"
 
-#: ../../mod/admin.php:799 ../../mod/admin.php:997
+#: ../../mod/admin.php:799 ../../mod/admin.php:1001
 msgid "Disable"
 msgstr "使不能用"
 
-#: ../../mod/admin.php:801 ../../mod/admin.php:999
+#: ../../mod/admin.php:801 ../../mod/admin.php:1003
 msgid "Enable"
 msgstr "使能用"
 
-#: ../../mod/admin.php:823 ../../mod/admin.php:1028
+#: ../../mod/admin.php:823 ../../mod/admin.php:1032
 msgid "Toggle"
 msgstr "肘节"
 
-#: ../../mod/admin.php:831 ../../mod/admin.php:1038
+#: ../../mod/admin.php:831 ../../mod/admin.php:1042
 msgid "Author: "
 msgstr "作家:"
 
-#: ../../mod/admin.php:832 ../../mod/admin.php:1039
+#: ../../mod/admin.php:832 ../../mod/admin.php:1043
 msgid "Maintainer: "
 msgstr "保持员:"
 
@@ -4200,61 +4264,61 @@ msgstr "保持员:"
 msgid "No themes found."
 msgstr "找不到主题。"
 
-#: ../../mod/admin.php:1020
+#: ../../mod/admin.php:1024
 msgid "Screenshot"
 msgstr "截图"
 
-#: ../../mod/admin.php:1068
+#: ../../mod/admin.php:1072
 msgid "[Experimental]"
 msgstr "[试验]"
 
-#: ../../mod/admin.php:1069
+#: ../../mod/admin.php:1073
 msgid "[Unsupported]"
 msgstr "[没支持]"
 
-#: ../../mod/admin.php:1096
+#: ../../mod/admin.php:1100
 msgid "Log settings updated."
 msgstr "日志设置更新了。"
 
-#: ../../mod/admin.php:1152
+#: ../../mod/admin.php:1156
 msgid "Clear"
 msgstr "清理出"
 
-#: ../../mod/admin.php:1158
+#: ../../mod/admin.php:1162
 msgid "Debugging"
 msgstr "调试"
 
-#: ../../mod/admin.php:1159
+#: ../../mod/admin.php:1163
 msgid "Log file"
 msgstr "记录文件"
 
-#: ../../mod/admin.php:1159
+#: ../../mod/admin.php:1163
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "必要被网页服务器可写的。相对Friendica主文件夹。"
 
-#: ../../mod/admin.php:1160
+#: ../../mod/admin.php:1164
 msgid "Log level"
 msgstr "记录水平"
 
-#: ../../mod/admin.php:1210
+#: ../../mod/admin.php:1214
 msgid "Close"
 msgstr "关闭"
 
-#: ../../mod/admin.php:1216
+#: ../../mod/admin.php:1220
 msgid "FTP Host"
 msgstr "FTP主机"
 
-#: ../../mod/admin.php:1217
+#: ../../mod/admin.php:1221
 msgid "FTP Path"
 msgstr "FTP目录"
 
-#: ../../mod/admin.php:1218
+#: ../../mod/admin.php:1222
 msgid "FTP User"
 msgstr "FTP用户"
 
-#: ../../mod/admin.php:1219
+#: ../../mod/admin.php:1223
 msgid "FTP Password"
 msgstr "FTP密码"
 
@@ -4348,7 +4412,7 @@ msgstr "没有共同熟人。"
 #: ../../mod/subthread.php:103
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
-msgstr ""
+msgstr "%1$s关注着%2$s的%3$s"
 
 #: ../../mod/share.php:44
 msgid "link"
@@ -4367,7 +4431,7 @@ msgid "No installed applications."
 msgstr "没有安装的应用"
 
 #: ../../mod/search.php:99 ../../include/text.php:738
-#: ../../include/text.php:739 ../../include/nav.php:91
+#: ../../include/text.php:739 ../../include/nav.php:118
 msgid "Search"
 msgstr "搜索"
 
@@ -4685,8 +4749,8 @@ msgstr "给打假可见的"
 msgid "Edit visibility"
 msgstr "修改能见度"
 
-#: ../../mod/filer.php:30 ../../include/conversation.php:942
-#: ../../include/conversation.php:960
+#: ../../mod/filer.php:30 ../../include/conversation.php:944
+#: ../../include/conversation.php:962
 msgid "Save to Folder:"
 msgstr "保存再文件夹:"
 
@@ -4694,7 +4758,7 @@ msgstr "保存再文件夹:"
 msgid "- select -"
 msgstr "-选择-"
 
-#: ../../mod/tagger.php:95 ../../include/conversation.php:265
+#: ../../mod/tagger.php:95 ../../include/conversation.php:266
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s把%4$s标签%2$s的%3$s"
@@ -4703,7 +4767,7 @@ msgstr "%1$s把%4$s标签%2$s的%3$s"
 msgid "No potential page delegates located."
 msgstr "找不到可能代表页人。"
 
-#: ../../mod/delegate.php:121 ../../include/nav.php:138
+#: ../../mod/delegate.php:121 ../../include/nav.php:165
 msgid "Delegate Page Management"
 msgstr "页代表管理"
 
@@ -4782,18 +4846,22 @@ msgstr "源代输入(Diaspora形式):"
 msgid "diaspora2bb: "
 msgstr "diaspora2bb: "
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
+#: ../../mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr ""
+
+#: ../../mod/suggest.php:66 ../../view/theme/diabook/theme.php:520
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "友谊建议"
 
-#: ../../mod/suggest.php:44
+#: ../../mod/suggest.php:72
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "没有建议。如果这是新网站,请24小时后再试。"
 
-#: ../../mod/suggest.php:61
+#: ../../mod/suggest.php:90
 msgid "Ignore/Hide"
 msgstr "不理/隐藏"
 
@@ -4840,7 +4908,7 @@ msgid "About:"
 msgstr "关于:"
 
 #: ../../mod/directory.php:187
-#: ../../addon/forumdirectory/forumdirectory.php:203
+#: ../../addon/forumdirectory/forumdirectory.php:201
 msgid "No entries (some entries may be hidden)."
 msgstr "没有文章(有的文章会被隐藏)。"
 
@@ -4971,7 +5039,7 @@ msgid "Unable to set contact photo."
 msgstr "不会指定熟人照片。"
 
 #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:621
-#: ../../include/conversation.php:171
+#: ../../include/conversation.php:172
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s是成为%2$s的朋友"
@@ -5737,7 +5805,7 @@ msgid "Forum Directory"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64
+#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:91
 #: ../../boot.php:1037 ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5774,8 +5842,8 @@ msgid "Latest likes"
 msgstr "最近喜欢"
 
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1496
-#: ../../include/conversation.php:117 ../../include/conversation.php:245
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1508
+#: ../../include/conversation.php:118 ../../include/conversation.php:246
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
 msgstr "项目"
@@ -6594,43 +6662,43 @@ msgstr "默认地转播到Dreamwidth"
 
 #: ../../addon/remote_permissions/remote_permissions.php:45
 msgid "Remote Permissions Settings"
-msgstr ""
+msgstr "对外批准设置"
 
 #: ../../addon/remote_permissions/remote_permissions.php:46
 msgid ""
 "Allow recipients of your private posts to see the other recipients of the "
 "posts"
-msgstr ""
+msgstr "允许您私人文章接受者看别接受者。"
 
 #: ../../addon/remote_permissions/remote_permissions.php:58
 msgid "Remote Permissions settings updated."
-msgstr ""
+msgstr "对外批准设置更新了。"
 
 #: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "Visible to"
-msgstr ""
+msgstr "可见的给"
 
 #: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "may only be a partial list"
-msgstr ""
+msgstr "可能部分的单"
 
 #: ../../addon/remote_permissions/remote_permissions.php:197
 #: ../../addon/altpager/altpager.php:99
 msgid "Global"
-msgstr ""
+msgstr "综合"
 
 #: ../../addon/remote_permissions/remote_permissions.php:197
 msgid "The posts of every user on this server show the post recipients"
-msgstr ""
+msgstr "这网站所有用户的文章表示接受者"
 
 #: ../../addon/remote_permissions/remote_permissions.php:198
 #: ../../addon/altpager/altpager.php:100
 msgid "Individual"
-msgstr ""
+msgstr "一个人的"
 
 #: ../../addon/remote_permissions/remote_permissions.php:198
 msgid "Each user chooses whether his/her posts show the post recipients"
-msgstr ""
+msgstr "各用户选择他问上是否表示接受者"
 
 #: ../../addon/startpage/startpage.php:83
 #: ../../addon.old/startpage/startpage.php:83
@@ -6742,17 +6810,17 @@ msgstr "评坛单设置"
 #: ../../addon/forumlist/forumlist.php:164
 #: ../../addon.old/forumlist/forumlist.php:161
 msgid "Randomise forum list"
-msgstr ""
+msgstr "洗牌评坛单"
 
 #: ../../addon/forumlist/forumlist.php:167
 #: ../../addon.old/forumlist/forumlist.php:164
 msgid "Show forums on profile page"
-msgstr ""
+msgstr "表示评坛在简介页"
 
 #: ../../addon/forumlist/forumlist.php:170
 #: ../../addon.old/forumlist/forumlist.php:167
 msgid "Show forums on network page"
-msgstr ""
+msgstr "表示评坛在网络页"
 
 #: ../../addon/impressum/impressum.php:37
 #: ../../addon.old/impressum/impressum.php:37
@@ -7273,7 +7341,7 @@ msgstr "把熟人jabber地址从内部单"
 msgid "Add contact"
 msgstr "加熟人"
 
-#: ../../addon/viewsrc/viewsrc.php:37 ../../addon.old/viewsrc/viewsrc.php:37
+#: ../../addon/viewsrc/viewsrc.php:39 ../../addon.old/viewsrc/viewsrc.php:37
 msgid "View Source"
 msgstr "看源代码"
 
@@ -7688,14 +7756,23 @@ msgstr ""
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr "转播连接的#标签盒@名到Twitter"
 
-#: ../../addon/twitter/twitter.php:556 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:558 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr "钥匙(Consumer key)"
 
-#: ../../addon/twitter/twitter.php:557 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:559 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr "密码(Consumer secret)"
 
+#: ../../addon/twitter/twitter.php:560
+msgid "Name of the Twitter Application"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:560
+msgid ""
+"set this to avoid mirroring postings from ~friendica back to ~friendica"
+msgstr ""
+
 #: ../../addon/irc/irc.php:44 ../../addon.old/irc/irc.php:44
 msgid "IRC Settings"
 msgstr "IRC设置"
@@ -7722,20 +7799,20 @@ msgstr "流行频道"
 
 #: ../../addon/fromapp/fromapp.php:38 ../../addon.old/fromapp/fromapp.php:38
 msgid "Fromapp settings updated."
-msgstr ""
+msgstr "Fromapp设置更新了"
 
 #: ../../addon/fromapp/fromapp.php:64 ../../addon.old/fromapp/fromapp.php:64
 msgid "FromApp Settings"
-msgstr ""
+msgstr "Fromapp设置"
 
 #: ../../addon/fromapp/fromapp.php:66 ../../addon.old/fromapp/fromapp.php:66
 msgid ""
 "The application name you would like to show your posts originating from."
-msgstr ""
+msgstr "应用名您想当您文章的来源"
 
 #: ../../addon/fromapp/fromapp.php:70 ../../addon.old/fromapp/fromapp.php:70
 msgid "Use this application name even if another application was used."
-msgstr ""
+msgstr "连别应用是用了也用这名。"
 
 #: ../../addon/blogger/blogger.php:42 ../../addon.old/blogger/blogger.php:42
 msgid "Post to blogger"
@@ -7830,12 +7907,12 @@ msgstr "选择主题宽"
 msgid "Color scheme"
 msgstr " 色彩设计"
 
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
-#: ../../include/nav.php:116
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:76
+#: ../../include/nav.php:143
 msgid "Your posts and conversations"
 msgstr "你的消息和交谈"
 
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:77
 msgid "Your profile page"
 msgstr "你的简介页"
 
@@ -7843,19 +7920,19 @@ msgstr "你的简介页"
 msgid "Your contacts"
 msgstr "您的熟人"
 
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:78
 msgid "Your photos"
 msgstr "你的照片"
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:79
 msgid "Your events"
 msgstr "你的项目"
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:80
 msgid "Personal notes"
 msgstr "私人的便条"
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:80
 msgid "Your personal photos"
 msgstr "你私人的照片"
 
@@ -7951,12 +8028,12 @@ msgid "Set twitter search term"
 msgstr "选择Twitter搜索关键"
 
 #: ../../view/theme/diabook/theme.php:629
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:327
 msgid "don't show"
 msgstr "别著"
 
 #: ../../view/theme/diabook/theme.php:629
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:326
 msgid "show"
 msgstr "著"
 
@@ -7999,11 +8076,11 @@ msgstr "中间"
 
 #: ../../view/theme/quattro/config.php:69
 msgid "Posts font size"
-msgstr ""
+msgstr "文章"
 
 #: ../../view/theme/quattro/config.php:70
 msgid "Textareas font size"
-msgstr ""
+msgstr "文本区字体大小"
 
 #: ../../view/theme/dispy/config.php:75
 msgid "Set colour scheme"
@@ -8136,7 +8213,7 @@ msgstr "MySpace"
 
 #: ../../include/contact_selectors.php:87
 msgid "Google+"
-msgstr ""
+msgstr "Google+"
 
 #: ../../include/profile_selectors.php:6
 msgid "Male"
@@ -8425,7 +8502,7 @@ msgstr[0] "%d熟人"
 msgid "poke"
 msgstr "戳"
 
-#: ../../include/text.php:779 ../../include/conversation.php:210
+#: ../../include/text.php:779 ../../include/conversation.php:211
 msgid "poked"
 msgstr "戳了"
 
@@ -8597,31 +8674,31 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: ../../include/text.php:1066
+#: ../../include/text.php:1078
 msgid "bytes"
 msgstr "字节"
 
-#: ../../include/text.php:1093 ../../include/text.php:1105
+#: ../../include/text.php:1105 ../../include/text.php:1117
 msgid "Click to open/close"
 msgstr "点击为开关"
 
-#: ../../include/text.php:1278 ../../include/user.php:237
+#: ../../include/text.php:1290 ../../include/user.php:237
 msgid "default"
 msgstr "默认"
 
-#: ../../include/text.php:1290
+#: ../../include/text.php:1302
 msgid "Select an alternate language"
 msgstr "选择别的语言"
 
-#: ../../include/text.php:1500
+#: ../../include/text.php:1512
 msgid "activity"
 msgstr "活动"
 
-#: ../../include/text.php:1503
+#: ../../include/text.php:1515
 msgid "post"
 msgstr "文章"
 
-#: ../../include/text.php:1658
+#: ../../include/text.php:1670
 msgid "Item filed"
 msgstr "把项目归档了"
 
@@ -8647,42 +8724,42 @@ msgstr "嵌入不能用"
 
 #: ../../include/uimport.php:61
 msgid "Error decoding account file"
-msgstr ""
+msgstr "解码账户文件出错误"
 
 #: ../../include/uimport.php:67
 msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr ""
+msgstr "错误!文件没有版本数!这不是Friendica账户文件吗?"
 
 #: ../../include/uimport.php:72
 msgid "Error! I can't import this file: DB schema version is not compatible."
-msgstr ""
+msgstr "错误!我进口不了这个文件:数据库版本不相容的。"
 
 #: ../../include/uimport.php:81
 msgid "Error! Cannot check nickname"
-msgstr ""
+msgstr "错误!不能检查昵称"
 
 #: ../../include/uimport.php:85
 #, php-format
 msgid "User '%s' already exists on this server!"
-msgstr ""
+msgstr "用户「%s」已经存在这个服务器!"
 
 #: ../../include/uimport.php:104
 msgid "User creation error"
-msgstr ""
+msgstr "用户创造错误"
 
 #: ../../include/uimport.php:122
 msgid "User profile creation error"
-msgstr ""
+msgstr "用户简介创造错误"
 
 #: ../../include/uimport.php:167
 #, php-format
 msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
-msgstr[0] ""
+msgstr[0] "%d熟人没进口了"
 
 #: ../../include/uimport.php:245
 msgid "Done. You can now login with your username and password"
-msgstr ""
+msgstr "完了。您现在会用您用户名和密码登录"
 
 #: ../../include/group.php:25
 msgid ""
@@ -8715,125 +8792,129 @@ msgstr "创造新组"
 msgid "Contacts not in any group"
 msgstr "熟人没有组"
 
-#: ../../include/nav.php:46 ../../boot.php:1036
+#: ../../include/nav.php:73 ../../boot.php:1036
 msgid "Logout"
 msgstr "注销"
 
-#: ../../include/nav.php:46
+#: ../../include/nav.php:73
 msgid "End this session"
 msgstr "结束这段时间"
 
-#: ../../include/nav.php:49 ../../boot.php:1833
+#: ../../include/nav.php:76 ../../boot.php:1833
 msgid "Status"
 msgstr "现状"
 
-#: ../../include/nav.php:64
+#: ../../include/nav.php:91
 msgid "Sign in"
 msgstr "登记"
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:104
 msgid "Home Page"
 msgstr "主页"
 
-#: ../../include/nav.php:81
+#: ../../include/nav.php:108
 msgid "Create an account"
 msgstr "注册"
 
-#: ../../include/nav.php:86
+#: ../../include/nav.php:113
 msgid "Help and documentation"
 msgstr "帮助证件"
 
-#: ../../include/nav.php:89
+#: ../../include/nav.php:116
 msgid "Apps"
 msgstr "应用程序"
 
-#: ../../include/nav.php:89
+#: ../../include/nav.php:116
 msgid "Addon applications, utilities, games"
 msgstr "可加的应用,设施,游戏"
 
-#: ../../include/nav.php:91
+#: ../../include/nav.php:118
 msgid "Search site content"
 msgstr "搜索网站内容"
 
-#: ../../include/nav.php:101
+#: ../../include/nav.php:128
 msgid "Conversations on this site"
 msgstr "这个网站的交谈"
 
-#: ../../include/nav.php:103
+#: ../../include/nav.php:130
 msgid "Directory"
 msgstr "名录"
 
-#: ../../include/nav.php:103
+#: ../../include/nav.php:130
 msgid "People directory"
 msgstr "人物名录"
 
-#: ../../include/nav.php:113
+#: ../../include/nav.php:140
 msgid "Conversations from your friends"
 msgstr "从你朋友们的交谈"
 
-#: ../../include/nav.php:114
+#: ../../include/nav.php:141
 msgid "Network Reset"
-msgstr ""
+msgstr "网络重设"
 
-#: ../../include/nav.php:114
+#: ../../include/nav.php:141
 msgid "Load Network page with no filters"
 msgstr ""
 
-#: ../../include/nav.php:122
+#: ../../include/nav.php:149
 msgid "Friend Requests"
 msgstr "友谊邀请"
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:151
 msgid "See all notifications"
 msgstr "看所有的通知"
 
-#: ../../include/nav.php:125
+#: ../../include/nav.php:152
 msgid "Mark all system notifications seen"
 msgstr "记号各系统通知看过的"
 
-#: ../../include/nav.php:129
+#: ../../include/nav.php:156
 msgid "Private mail"
 msgstr "私人的邮件"
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:157
 msgid "Inbox"
 msgstr "收件箱"
 
-#: ../../include/nav.php:131
+#: ../../include/nav.php:158
 msgid "Outbox"
 msgstr "发件箱"
 
-#: ../../include/nav.php:135
+#: ../../include/nav.php:162
 msgid "Manage"
 msgstr "代用户"
 
-#: ../../include/nav.php:135
+#: ../../include/nav.php:162
 msgid "Manage other pages"
 msgstr "管理别的页"
 
-#: ../../include/nav.php:138
+#: ../../include/nav.php:165
 msgid "Delegations"
 msgstr ""
 
-#: ../../include/nav.php:142 ../../boot.php:1339
+#: ../../include/nav.php:169 ../../boot.php:1339
 msgid "Profiles"
 msgstr "简介"
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:169
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:144
+#: ../../include/nav.php:171
 msgid "Manage/edit friends and contacts"
 msgstr "管理/编朋友们和熟人们"
 
-#: ../../include/nav.php:151
+#: ../../include/nav.php:178
 msgid "Site setup and configuration"
 msgstr "网站开办和配置"
 
-#: ../../include/nav.php:175
-msgid "Nothing new here"
-msgstr "这里没有什么新的"
+#: ../../include/nav.php:182
+msgid "Navigation"
+msgstr ""
+
+#: ../../include/nav.php:182
+msgid "Site map"
+msgstr ""
 
 #: ../../include/contact_widgets.php:6
 msgid "Add New Contact"
@@ -9150,7 +9231,7 @@ msgstr "找不到DNS信息为数据库服务器「%s」"
 msgid "[no subject]"
 msgstr "[无题目]"
 
-#: ../../include/acl_selectors.php:311
+#: ../../include/acl_selectors.php:325
 msgid "Visible to everybody"
 msgstr "任何人可见的"
 
@@ -9403,7 +9484,11 @@ msgstr "一位新人给你分享在"
 msgid "You have a new follower at "
 msgstr "你有新的关注者在"
 
-#: ../../include/items.php:4057
+#: ../../include/items.php:3892
+msgid "Do you really want to delete this item?"
+msgstr ""
+
+#: ../../include/items.php:4085
 msgid "Archives"
 msgstr "档案"
 
@@ -9487,7 +9572,7 @@ msgstr "请上传一张简介照片"
 msgid "Welcome back "
 msgstr "欢迎归来"
 
-#: ../../include/security.php:357
+#: ../../include/security.php:366
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
@@ -9497,147 +9582,163 @@ msgstr "表格安全令牌不对。最可能因为表格开着太久(三个小
 msgid "stopped following"
 msgstr "结束关注了"
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:818
+#: ../../include/Contact.php:225 ../../include/conversation.php:820
 msgid "Poke"
 msgstr "戳"
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:812
+#: ../../include/Contact.php:226 ../../include/conversation.php:814
 msgid "View Status"
 msgstr "看现状"
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:813
+#: ../../include/Contact.php:227 ../../include/conversation.php:815
 msgid "View Profile"
 msgstr "看简介"
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:814
+#: ../../include/Contact.php:228 ../../include/conversation.php:816
 msgid "View Photos"
 msgstr "看照片"
 
-#: ../../include/Contact.php:229 ../../include/Contact.php:242
-#: ../../include/conversation.php:815
+#: ../../include/Contact.php:229 ../../include/Contact.php:251
+#: ../../include/conversation.php:817
 msgid "Network Posts"
 msgstr "网络文章"
 
-#: ../../include/Contact.php:230 ../../include/Contact.php:242
-#: ../../include/conversation.php:816
+#: ../../include/Contact.php:230 ../../include/Contact.php:251
+#: ../../include/conversation.php:818
 msgid "Edit Contact"
 msgstr "编辑熟人"
 
-#: ../../include/Contact.php:231 ../../include/Contact.php:242
-#: ../../include/conversation.php:817
+#: ../../include/Contact.php:231 ../../include/Contact.php:251
+#: ../../include/conversation.php:819
 msgid "Send PM"
 msgstr "法私人的新闻"
 
-#: ../../include/conversation.php:206
+#: ../../include/conversation.php:207
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s把%2$s戳"
 
-#: ../../include/conversation.php:290
+#: ../../include/conversation.php:291
 msgid "post/item"
 msgstr "文章/项目"
 
-#: ../../include/conversation.php:291
+#: ../../include/conversation.php:292
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s标注%2$s的%3$s为偏爱"
 
-#: ../../include/conversation.php:620 ../../object/Item.php:249
+#: ../../include/conversation.php:621 ../../object/Item.php:249
 msgid "Categories:"
-msgstr ""
+msgstr "种类:"
 
-#: ../../include/conversation.php:621 ../../object/Item.php:250
+#: ../../include/conversation.php:622 ../../object/Item.php:250
 msgid "Filed under:"
-msgstr ""
+msgstr "归档在:"
 
-#: ../../include/conversation.php:708
+#: ../../include/conversation.php:710
 msgid "remove"
 msgstr "删除"
 
-#: ../../include/conversation.php:712
+#: ../../include/conversation.php:714
 msgid "Delete Selected Items"
 msgstr "删除选的项目"
 
-#: ../../include/conversation.php:811
+#: ../../include/conversation.php:813
 msgid "Follow Thread"
-msgstr ""
+msgstr "关注线绳"
 
-#: ../../include/conversation.php:880
+#: ../../include/conversation.php:882
 #, php-format
 msgid "%s likes this."
 msgstr "%s喜欢这个."
 
-#: ../../include/conversation.php:880
+#: ../../include/conversation.php:882
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s没有喜欢这个."
 
-#: ../../include/conversation.php:885
+#: ../../include/conversation.php:887
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:890
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: ../../include/conversation.php:902
+#: ../../include/conversation.php:904
 msgid "and"
 msgstr "和"
 
-#: ../../include/conversation.php:908
+#: ../../include/conversation.php:910
 #, php-format
 msgid ", and %d other people"
 msgstr ",和%d别人"
 
-#: ../../include/conversation.php:910
+#: ../../include/conversation.php:912
 #, php-format
 msgid "%s like this."
 msgstr "%s喜欢这个"
 
-#: ../../include/conversation.php:910
+#: ../../include/conversation.php:912
 #, php-format
 msgid "%s don't like this."
 msgstr "%s不喜欢这个"
 
-#: ../../include/conversation.php:937 ../../include/conversation.php:955
+#: ../../include/conversation.php:939 ../../include/conversation.php:957
 msgid "Visible to <strong>everybody</strong>"
 msgstr "<strong>大家</strong>可见的"
 
-#: ../../include/conversation.php:939 ../../include/conversation.php:957
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Please enter a video link/URL:"
 msgstr "请输入视频连接/URL:"
 
-#: ../../include/conversation.php:940 ../../include/conversation.php:958
+#: ../../include/conversation.php:942 ../../include/conversation.php:960
 msgid "Please enter an audio link/URL:"
 msgstr "请输入音响连接/URL:"
 
-#: ../../include/conversation.php:941 ../../include/conversation.php:959
+#: ../../include/conversation.php:943 ../../include/conversation.php:961
 msgid "Tag term:"
 msgstr "标签:"
 
-#: ../../include/conversation.php:943 ../../include/conversation.php:961
+#: ../../include/conversation.php:945 ../../include/conversation.php:963
 msgid "Where are you right now?"
 msgstr "你在哪里?"
 
-#: ../../include/conversation.php:944
+#: ../../include/conversation.php:946
 msgid "Delete item(s)?"
-msgstr ""
+msgstr "把项目删除吗?"
 
-#: ../../include/conversation.php:1023
+#: ../../include/conversation.php:988
+msgid "Post to Email"
+msgstr "电邮发布"
+
+#: ../../include/conversation.php:1044
 msgid "permissions"
 msgstr "权利"
 
-#: ../../include/plugin.php:389 ../../include/plugin.php:391
+#: ../../include/conversation.php:1068
+msgid "Post to Groups"
+msgstr ""
+
+#: ../../include/conversation.php:1069
+msgid "Post to Contacts"
+msgstr ""
+
+#: ../../include/conversation.php:1070
+msgid "Private post"
+msgstr ""
+
+#: ../../include/plugin.php:429 ../../include/plugin.php:431
 msgid "Click here to upgrade."
 msgstr "这里点击为更新。"
 
-#: ../../include/plugin.php:397
+#: ../../include/plugin.php:437
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "这个行动超过您订阅的限制。"
 
-#: ../../include/plugin.php:402
+#: ../../include/plugin.php:442
 msgid "This action is not available under your subscription plan."
 msgstr "这个行动在您的订阅不可用的。"
 
@@ -9673,7 +9774,7 @@ msgstr "密码: "
 
 #: ../../boot.php:1041
 msgid "Remember me"
-msgstr ""
+msgstr "记住我"
 
 #: ../../boot.php:1044
 msgid "Or login using OpenID: "
@@ -9765,11 +9866,11 @@ msgstr "只您许看这个"
 
 #: ../../object/Item.php:261
 msgid "via"
-msgstr ""
+msgstr "经过"
 
 #: ../../index.php:400
 msgid "toggle mobile"
-msgstr ""
+msgstr "交替手机"
 
 #: ../../addon.old/bg/bg.php:51
 msgid "Bg settings updated."
index 51b59ad2ab5b6e22c0d05c713045f22664a87698..cbc6202d07f3c645bfcb9f3f01abfcc9dd94c27d 100644 (file)
@@ -59,7 +59,7 @@ $a->strings["Tag removed"] = "标签去除了";
 $a->strings["Remove Item Tag"] = "去除项目标签";
 $a->strings["Select a tag to remove: "] = "选择标签去除";
 $a->strings["Remove"] = "移走";
-$a->strings["%1\$s welcomes %2\$s"] = "";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s欢迎%2\$s";
 $a->strings["Authorize application connection"] = "授权应用连接";
 $a->strings["Return to your app and insert this Securty Code:"] = "回归您的应用和输入这个安全密码:";
 $a->strings["Please login to continue."] = "请登记为继续。";
@@ -74,9 +74,11 @@ $a->strings["Contact information unavailable"] = "熟人信息不可用";
 $a->strings["Profile Photos"] = "简介照片";
 $a->strings["Album not found."] = "取回不了相册.";
 $a->strings["Delete Album"] = "删除相册";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "";
 $a->strings["Delete Photo"] = "删除照片";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "";
-$a->strings["a photo"] = "";
+$a->strings["Do you really want to delete this photo?"] = "";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s被%3\$s标签在%2\$s";
+$a->strings["a photo"] = "一张照片";
 $a->strings["Image exceeds size limit of "] = "图片超出最大尺寸";
 $a->strings["Image file is empty."] = "图片文件空的。";
 $a->strings["Unable to process image."] = "处理不了图像.";
@@ -90,6 +92,10 @@ $a->strings["New album name: "] = "新册名:";
 $a->strings["or existing album name: "] = "或现有册名";
 $a->strings["Do not show a status post for this upload"] = "别显示现状报到关于这个上传";
 $a->strings["Permissions"] = "权利";
+$a->strings["Show to Groups"] = "";
+$a->strings["Show to Contacts"] = "";
+$a->strings["Private Photo"] = "";
+$a->strings["Public Photo"] = "";
 $a->strings["Edit Album"] = "编照片册";
 $a->strings["Show Newest First"] = "先表示最新的";
 $a->strings["Show Oldest First"] = "先表示最老的";
@@ -109,6 +115,8 @@ $a->strings["New album name"] = "新册名";
 $a->strings["Caption"] = "字幕";
 $a->strings["Add a Tag"] = "加标签";
 $a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "例子:@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv";
+$a->strings["Private photo"] = "";
+$a->strings["Public photo"] = "";
 $a->strings["I like this (toggle)"] = "我喜欢这(交替)";
 $a->strings["I don't like this (toggle)"] = "我不喜欢这(交替)";
 $a->strings["Share"] = "分享";
@@ -131,7 +139,6 @@ $a->strings["Installed plugins/addons/apps:"] = "安装的插件/加件/应
 $a->strings["No installed plugins/addons/apps"] = "没有安装的插件/应用";
 $a->strings["Item not found"] = "项目没找到";
 $a->strings["Edit post"] = "编辑文章";
-$a->strings["Post to Email"] = "电邮发布";
 $a->strings["Edit"] = "编辑";
 $a->strings["Upload photo"] = "上传照片";
 $a->strings["upload photo"] = "上传照片";
@@ -205,10 +212,10 @@ $a->strings["Connected apps"] = "连接着应用";
 $a->strings["Export personal data"] = "出口私人信息";
 $a->strings["Remove account"] = "删除账户";
 $a->strings["Settings"] = "配置";
-$a->strings["Export account"] = "";
-$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "";
-$a->strings["Export all"] = "";
-$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "";
+$a->strings["Export account"] = "出口账户";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "出口您的商户信息和熟人。这利于备份您的账户活着搬到别的服务器。";
+$a->strings["Export all"] = "出口一切";
+$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "出口您账户信息,熟人和别的项目成json。可能是很大文件,花很多时间。用这个为创造全备份您的账户(照片没被出口)";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica社会交通服务器-安装";
 $a->strings["Could not connect to database."] = "解不了数据库。";
 $a->strings["Could not create table."] = "造成不了表格。";
@@ -270,7 +277,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>下步是什么</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "重要:您要[手工地]准备安排的任务给喂器。";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "时间装换";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica提供这个服务目的是分享项目跟别的网络和朋友们在别的时区。";
 $a->strings["UTC time: %s"] = "UTC时间: %s";
 $a->strings["Current timezone: %s"] = "现在时区: %s";
 $a->strings["Converted localtime: %s"] = "装换的当地时间:%s";
@@ -374,6 +381,7 @@ $a->strings["Contact has been ignored"] = "熟人不理了";
 $a->strings["Contact has been unignored"] = "熟人否不理了";
 $a->strings["Contact has been archived"] = "把联系存档了";
 $a->strings["Contact has been unarchived"] = "把联系从存档拿来了";
+$a->strings["Do you really want to delete this contact?"] = "";
 $a->strings["Contact has been removed."] = "熟人删除了。";
 $a->strings["You are mutual friends with %s"] = "您和%s是共同朋友们";
 $a->strings["You are sharing with %s"] = "您分享给%s";
@@ -454,12 +462,12 @@ $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["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["Features updated"] = "特点更新了";
 $a->strings["Passwords do not match. Password unchanged."] = "密码们不相配。密码没未改变的。";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "空的密码禁止。密码没未改变的。";
 $a->strings["Password changed."] = "密码变化了。";
@@ -483,9 +491,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["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"] = "使不能用";
@@ -564,6 +572,9 @@ $a->strings["Maximum Friend Requests/Day:"] = "最多友谊要求个天:";
 $a->strings["(to prevent spam abuse)"] = "(为防止垃圾邮件滥用)";
 $a->strings["Default Post Permissions"] = "默认文章准许";
 $a->strings["(click to open/close)"] = "(点击为打开/关闭)";
+$a->strings["Default Private Post"] = "";
+$a->strings["Default Public Post"] = "";
+$a->strings["Default Permissions for New Posts"] = "";
 $a->strings["Maximum private messages per day from unknown people:"] = "一天最多从生人私人邮件:";
 $a->strings["Notification Settings"] = "消息设置";
 $a->strings["By default post a status message when:"] = "默认地发现状通知如果:";
@@ -609,13 +620,13 @@ $a->strings["Invalid contact."] = "无效熟人。";
 $a->strings["Personal Notes"] = "私人便条";
 $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["Import"] = "进口";
+$a->strings["Move account"] = "把账户搬出";
 $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["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."] = "一天最多墙通知给%s超过了。通知没有通过 。";
 $a->strings["No recipient selected."] = "没有选择的接受者。";
 $a->strings["Unable to check your home location."] = "核对不了您的主页。";
@@ -744,8 +755,11 @@ $a->strings["No profile"] = "无简介";
 $a->strings["Remove My Account"] = "删除我的账户";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "这要完全删除您的账户。这一做过,就不能恢复。";
 $a->strings["Please enter your password for verification:"] = "请输入密码为确认:";
+$a->strings["Nothing new here"] = "这里没有什么新的";
+$a->strings["Clear notifications"] = "";
 $a->strings["New Message"] = "新的消息";
 $a->strings["Unable to locate contact information."] = "找不到熟人信息。";
+$a->strings["Do you really want to delete this message?"] = "";
 $a->strings["Message deleted."] = "消息删除了。";
 $a->strings["Conversation removed."] = "交流删除了。";
 $a->strings["No messages."] = "没有消息";
@@ -834,7 +848,7 @@ $a->strings["URL to update the global directory. If this is not set, the global
 $a->strings["Allow threaded items"] = "允许线绳项目";
 $a->strings["Allow infinite level threading for items on this site."] = "允许无限水平线绳为这网站的项目。";
 $a->strings["Private posts by default for new users"] = "新用户默认写私人文章";
-$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "默认新用户文章批准使默认隐私组,没有公开。";
 $a->strings["Block multiple registrations"] = "拦一人多注册";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "不允许用户注册别的账户为当页。";
 $a->strings["OpenID support"] = "OpenID支持";
@@ -896,7 +910,7 @@ $a->strings["Request date"] = "要求日期";
 $a->strings["Email"] = "电子邮件";
 $a->strings["No registrations."] = "没有注册。";
 $a->strings["Deny"] = "否定";
-$a->strings["Site admin"] = "";
+$a->strings["Site admin"] = "网站管理员";
 $a->strings["Register date"] = "注册日期";
 $a->strings["Last login"] = "上次登录";
 $a->strings["Last item"] = "上项目";
@@ -945,7 +959,7 @@ $a->strings["Login failed."] = "登记失败了。";
 $a->strings["Contact added"] = "熟人添了";
 $a->strings["Common Friends"] = "普通朋友们";
 $a->strings["No contacts in common."] = "没有共同熟人。";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s关注着%2\$s的%3\$s";
 $a->strings["link"] = "链接";
 $a->strings["Item has been removed."] = "项目被删除了。";
 $a->strings["Applications"] = "应用";
@@ -1050,6 +1064,7 @@ $a->strings["bb2dia2bb: "] = "bb2dia2bb:";
 $a->strings["bb2md2html2bb: "] = "bb2md2html2bb:";
 $a->strings["Source input (Diaspora format): "] = "源代输入(Diaspora形式):";
 $a->strings["diaspora2bb: "] = "diaspora2bb: ";
+$a->strings["Do you really want to delete this suggestion?"] = "";
 $a->strings["Friend Suggestions"] = "友谊建议";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "没有建议。如果这是新网站,请24小时后再试。";
 $a->strings["Ignore/Hide"] = "不理/隐藏";
@@ -1395,15 +1410,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "使Dreamwidth转播插件可用"
 $a->strings["dreamwidth username"] = "Dreamwidth用户名";
 $a->strings["dreamwidth password"] = "Dreamwidth密码";
 $a->strings["Post to dreamwidth by default"] = "默认地转播到Dreamwidth";
-$a->strings["Remote Permissions Settings"] = "";
-$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
-$a->strings["Remote Permissions settings updated."] = "";
-$a->strings["Visible to"] = "";
-$a->strings["may only be a partial list"] = "";
-$a->strings["Global"] = "";
-$a->strings["The posts of every user on this server show the post recipients"] = "";
-$a->strings["Individual"] = "";
-$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
+$a->strings["Remote Permissions Settings"] = "对外批准设置";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "允许您私人文章接受者看别接受者。";
+$a->strings["Remote Permissions settings updated."] = "对外批准设置更新了。";
+$a->strings["Visible to"] = "可见的给";
+$a->strings["may only be a partial list"] = "可能部分的单";
+$a->strings["Global"] = "综合";
+$a->strings["The posts of every user on this server show the post recipients"] = "这网站所有用户的文章表示接受者";
+$a->strings["Individual"] = "一个人的";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "各用户选择他问上是否表示接受者";
 $a->strings["Startpage Settings"] = "开始页设置";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "主页登录后表示-留空白为简介墙";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "例如:&quot;网络&quot;或&quot;通知/系统&quot;";
@@ -1424,9 +1439,9 @@ $a->strings["show/hide"] = "表示/隐藏";
 $a->strings["No forum subscriptions"] = "没有评坛订阅";
 $a->strings["Forumlist settings updated."] = "评坛单设置更新了。";
 $a->strings["Forumlist Settings"] = "评坛单设置";
-$a->strings["Randomise forum list"] = "";
-$a->strings["Show forums on profile page"] = "";
-$a->strings["Show forums on network page"] = "";
+$a->strings["Randomise forum list"] = "洗牌评坛单";
+$a->strings["Show forums on profile page"] = "表示评坛在简介页";
+$a->strings["Show forums on network page"] = "表示评坛在网络页";
 $a->strings["Impressum"] = "Impressum(法定的出版信息)";
 $a->strings["Site Owner"] = "网站主";
 $a->strings["Email Address"] = "电子邮件地址";
@@ -1609,16 +1624,18 @@ $a->strings["Shortening method that optimizes the tweet"] = "";
 $a->strings["Send linked #-tags and @-names to Twitter"] = "转播连接的#标签盒@名到Twitter";
 $a->strings["Consumer key"] = "钥匙(Consumer key)";
 $a->strings["Consumer secret"] = "密码(Consumer secret)";
+$a->strings["Name of the Twitter Application"] = "";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "";
 $a->strings["IRC Settings"] = "IRC设置";
 $a->strings["Channel(s) to auto connect (comma separated)"] = "频道要自动地连接(逗号分隔)";
 $a->strings["Popular Channels (comma separated)"] = "流行频道(逗号分隔)";
 $a->strings["IRC settings saved."] = "IRC设置保存了。";
 $a->strings["IRC Chatroom"] = "IRC聊间";
 $a->strings["Popular Channels"] = "流行频道";
-$a->strings["Fromapp settings updated."] = "";
-$a->strings["FromApp Settings"] = "";
-$a->strings["The application name you would like to show your posts originating from."] = "";
-$a->strings["Use this application name even if another application was used."] = "";
+$a->strings["Fromapp settings updated."] = "Fromapp设置更新了";
+$a->strings["FromApp Settings"] = "Fromapp设置";
+$a->strings["The application name you would like to show your posts originating from."] = "应用名您想当您文章的来源";
+$a->strings["Use this application name even if another application was used."] = "连别应用是用了也用这名。";
 $a->strings["Post to blogger"] = "转播到blogger";
 $a->strings["Blogger Post Settings"] = "Blogger转播设置";
 $a->strings["Enable Blogger Post Plugin"] = "使Blogger转播插件可用";
@@ -1674,8 +1691,8 @@ $a->strings["Last tweets"] = "最后准文";
 $a->strings["Alignment"] = "成直线 ";
 $a->strings["Left"] = "左边";
 $a->strings["Center"] = "中间";
-$a->strings["Posts font size"] = "";
-$a->strings["Textareas font size"] = "";
+$a->strings["Posts font size"] = "文章";
+$a->strings["Textareas font size"] = "文本区字体大小";
 $a->strings["Set colour scheme"] = "选择色彩设计";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@@ -1708,7 +1725,7 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["Google+"] = "";
+$a->strings["Google+"] = "Google+";
 $a->strings["Male"] = "男的";
 $a->strings["Female"] = "女的";
 $a->strings["Currently Male"] = "现在男的";
@@ -1837,17 +1854,17 @@ $a->strings["Attachments:"] = "附件:";
 $a->strings["view full size"] = "看全尺寸";
 $a->strings["Embedded content"] = "嵌入内容";
 $a->strings["Embedding disabled"] = "嵌入不能用";
-$a->strings["Error decoding account file"] = "";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "";
-$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "";
-$a->strings["Error! Cannot check nickname"] = "";
-$a->strings["User '%s' already exists on this server!"] = "";
-$a->strings["User creation error"] = "";
-$a->strings["User profile creation error"] = "";
+$a->strings["Error decoding account file"] = "解码账户文件出错误";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "错误!文件没有版本数!这不是Friendica账户文件吗?";
+$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "错误!我进口不了这个文件:数据库版本不相容的。";
+$a->strings["Error! Cannot check nickname"] = "错误!不能检查昵称";
+$a->strings["User '%s' already exists on this server!"] = "用户「%s」已经存在这个服务器!";
+$a->strings["User creation error"] = "用户创造错误";
+$a->strings["User profile creation error"] = "用户简介创造错误";
 $a->strings["%d contact not imported"] = array(
-       0 => "",
+       0 => "%d熟人没进口了",
 );
-$a->strings["Done. You can now login with your username and password"] = "";
+$a->strings["Done. You can now login with your username and password"] = "完了。您现在会用您用户名和密码登录";
 $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"] = "每人";
@@ -1869,7 +1886,7 @@ $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["Network Reset"] = "网络重设";
 $a->strings["Load Network page with no filters"] = "";
 $a->strings["Friend Requests"] = "友谊邀请";
 $a->strings["See all notifications"] = "看所有的通知";
@@ -1884,7 +1901,8 @@ $a->strings["Profiles"] = "简介";
 $a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "管理/编朋友们和熟人们";
 $a->strings["Site setup and configuration"] = "网站开办和配置";
-$a->strings["Nothing new here"] = "这里没有什么新的";
+$a->strings["Navigation"] = "";
+$a->strings["Site map"] = "";
 $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";
@@ -2016,6 +2034,7 @@ $a->strings["Unable to retrieve contact information."] = "不能取回熟人消
 $a->strings["following"] = "关注";
 $a->strings["A new person is sharing with you at "] = "一位新人给你分享在";
 $a->strings["You have a new follower at "] = "你有新的关注者在";
+$a->strings["Do you really want to delete this item?"] = "";
 $a->strings["Archives"] = "档案";
 $a->strings["An invitation is required."] = "邀请必要的。";
 $a->strings["Invitation could not be verified."] = "不能证实邀请。";
@@ -2048,11 +2067,11 @@ $a->strings["Send PM"] = "法私人的新闻";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s把%2\$s戳";
 $a->strings["post/item"] = "文章/项目";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s标注%2\$s的%3\$s为偏爱";
-$a->strings["Categories:"] = "";
-$a->strings["Filed under:"] = "";
+$a->strings["Categories:"] = "种类:";
+$a->strings["Filed under:"] = "归档在:";
 $a->strings["remove"] = "删除";
 $a->strings["Delete Selected Items"] = "删除选的项目";
-$a->strings["Follow Thread"] = "";
+$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"] = "";
@@ -2066,8 +2085,12 @@ $a->strings["Please enter a video link/URL:"] = "请输入视频连接/URL:"
 $a->strings["Please enter an audio link/URL:"] = "请输入音响连接/URL:";
 $a->strings["Tag term:"] = "标签:";
 $a->strings["Where are you right now?"] = "你在哪里?";
-$a->strings["Delete item(s)?"] = "";
+$a->strings["Delete item(s)?"] = "把项目删除吗?";
+$a->strings["Post to Email"] = "电邮发布";
 $a->strings["permissions"] = "权利";
+$a->strings["Post to Groups"] = "";
+$a->strings["Post to Contacts"] = "";
+$a->strings["Private post"] = "";
 $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."] = "这个行动在您的订阅不可用的。";
@@ -2078,7 +2101,7 @@ $a->strings["Update Error at %s"] = "更新错误在%s";
 $a->strings["Create a New Account"] = "创造新的账户";
 $a->strings["Nickname or Email address: "] = "绰号或电子邮件地址: ";
 $a->strings["Password: "] = "密码: ";
-$a->strings["Remember me"] = "";
+$a->strings["Remember me"] = "记住我";
 $a->strings["Or login using OpenID: "] = "或者用OpenID登记:";
 $a->strings["Forgot your password?"] = "忘记你的密码吗?";
 $a->strings["Website Terms of Service"] = "";
@@ -2101,8 +2124,8 @@ $a->strings["Status Messages and Posts"] = "现状通知和文章";
 $a->strings["Profile Details"] = "简介内容";
 $a->strings["Events and Calendar"] = "项目和日历";
 $a->strings["Only You Can See This"] = "只您许看这个";
-$a->strings["via"] = "";
-$a->strings["toggle mobile"] = "";
+$a->strings["via"] = "经过";
+$a->strings["toggle mobile"] = "交替手机";
 $a->strings["Bg settings updated."] = "Bg设置更新了";
 $a->strings["Bg Settings"] = "Bg设置";
 $a->strings["Post to Drupal"] = "发到Drupal";