From f87631b3f72f9e733a6da1f67eaa47a5fb336ac1 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 28 Jun 2013 14:33:33 +0200
Subject: [PATCH] ZH_CN: update to the strings

---
 view/zh-cn/messages.po | 973 +++++++++++++++++++++--------------------
 view/zh-cn/strings.php | 152 +++----
 2 files changed, 563 insertions(+), 562 deletions(-)

diff --git a/view/zh-cn/messages.po b/view/zh-cn/messages.po
index 387d4f8dcd..b2c450d6e8 100644
--- a/view/zh-cn/messages.po
+++ b/view/zh-cn/messages.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-06-12 00:01-0700\n"
-"PO-Revision-Date: 2013-06-07 13:45+0000\n"
+"POT-Creation-Date: 2013-06-26 00:01-0700\n"
+"PO-Revision-Date: 2013-06-27 12:47+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"
@@ -23,7 +23,7 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1947
+#: ../../boot.php:1951
 msgid "Profile"
 msgstr "简介"
 
@@ -32,7 +32,7 @@ msgid "Full Name:"
 msgstr "全名："
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1487
+#: ../../boot.php:1491
 msgid "Gender:"
 msgstr "性别:"
 
@@ -53,7 +53,7 @@ msgid "Age:"
 msgstr "年纪："
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1490
+#: ../../boot.php:1494
 msgid "Status:"
 msgstr "现状:"
 
@@ -67,7 +67,7 @@ msgid "Sexual Preference:"
 msgstr "性取向"
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1492
+#: ../../boot.php:1496
 msgid "Homepage:"
 msgstr "主页:"
 
@@ -470,7 +470,7 @@ msgid "Finishes:"
 msgstr "结束："
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1485
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1489
 msgid "Location:"
 msgstr "位置:"
 
@@ -597,7 +597,7 @@ msgstr "要紧错误：产生安全钥匙失败了。"
 msgid "An error occurred during registration. Please try again."
 msgstr "报到出了问题。请再试。"
 
-#: ../../include/user.php:237 ../../include/text.php:1596
+#: ../../include/user.php:237 ../../include/text.php:1618
 msgid "default"
 msgstr "默认"
 
@@ -724,7 +724,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "比如：li@example.com, http://example.com/li"
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1417
+#: ../../mod/match.php:58 ../../boot.php:1421
 msgid "Connect"
 msgstr "连接"
 
@@ -750,8 +750,8 @@ msgstr "连接/关注"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "比如：李某，打鱼"
 
-#: ../../include/contact_widgets.php:33 ../../mod/contacts.php:613
-#: ../../mod/directory.php:61
+#: ../../include/contact_widgets.php:33 ../../mod/directory.php:61
+#: ../../mod/contacts.php:613
 msgid "Find"
 msgstr "搜索"
 
@@ -799,7 +799,7 @@ msgid_plural "%d contacts in common"
 msgstr[0] "%d共同熟人"
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:671
+#: ../../object/Item.php:365 ../../boot.php:675
 msgid "show more"
 msgstr "看多"
 
@@ -925,7 +925,7 @@ msgstr "%1$s是成为%2$s的朋友"
 msgid "Sharing notification from Diaspora network"
 msgstr "分享通知从Diaspora网络"
 
-#: ../../include/diaspora.php:1874 ../../include/text.php:1862
+#: ../../include/diaspora.php:1874 ../../include/text.php:1884
 #: ../../include/conversation.php:126 ../../include/conversation.php:254
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
 #: ../../view/theme/diabook/theme.php:464
@@ -974,25 +974,25 @@ msgid "Do you really want to delete this item?"
 msgstr "您真的想删除这个项目吗？"
 
 #: ../../include/items.php:4020 ../../mod/profiles.php:610
-#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/contacts.php:246
-#: ../../mod/settings.php:961 ../../mod/settings.php:967
-#: ../../mod/settings.php:975 ../../mod/settings.php:979
-#: ../../mod/settings.php:984 ../../mod/settings.php:990
-#: ../../mod/settings.php:996 ../../mod/settings.php:1002
-#: ../../mod/settings.php:1032 ../../mod/settings.php:1033
-#: ../../mod/settings.php:1034 ../../mod/settings.php:1035
-#: ../../mod/settings.php:1036 ../../mod/dfrn_request.php:836
-#: ../../mod/suggest.php:29 ../../mod/message.php:209
+#: ../../mod/api.php:105 ../../mod/register.php:239 ../../mod/settings.php:961
+#: ../../mod/settings.php:967 ../../mod/settings.php:975
+#: ../../mod/settings.php:979 ../../mod/settings.php:984
+#: ../../mod/settings.php:990 ../../mod/settings.php:996
+#: ../../mod/settings.php:1002 ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033 ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035 ../../mod/settings.php:1036
+#: ../../mod/dfrn_request.php:836 ../../mod/suggest.php:29
+#: ../../mod/message.php:209 ../../mod/contacts.php:246
 msgid "Yes"
 msgstr "是"
 
 #: ../../include/items.php:4023 ../../include/conversation.php:1120
-#: ../../mod/contacts.php:249 ../../mod/settings.php:585
-#: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
-#: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:148 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/message.php:212
-#: ../../mod/photos.php:202 ../../mod/photos.php:290
+#: ../../mod/settings.php:585 ../../mod/settings.php:611
+#: ../../mod/dfrn_request.php:848 ../../mod/suggest.php:32
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:148
+#: ../../mod/fbrowser.php:81 ../../mod/fbrowser.php:116
+#: ../../mod/message.php:212 ../../mod/photos.php:202 ../../mod/photos.php:290
+#: ../../mod/contacts.php:249
 msgid "Cancel"
 msgstr "退消"
 
@@ -1001,12 +1001,12 @@ msgstr "退消"
 #: ../../mod/nogroup.php:25 ../../mod/item.php:143 ../../mod/item.php:159
 #: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
-#: ../../mod/contacts.php:147 ../../mod/settings.php:91
+#: ../../mod/uimport.php:23 ../../mod/settings.php:91
 #: ../../mod/settings.php:566 ../../mod/settings.php:571
 #: ../../mod/crepair.php:115 ../../mod/delegate.php:6 ../../mod/poke.php:135
 #: ../../mod/dfrn_confirm.php:53 ../../mod/suggest.php:56
-#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/uimport.php:23
-#: ../../mod/follow.php:9 ../../mod/fsuggest.php:78 ../../mod/group.php:19
+#: ../../mod/editpost.php:10 ../../mod/events.php:140 ../../mod/follow.php:9
+#: ../../mod/fsuggest.php:78 ../../mod/group.php:19
 #: ../../mod/viewcontacts.php:22 ../../mod/wall_attach.php:55
 #: ../../mod/wall_upload.php:66 ../../mod/invite.php:15
 #: ../../mod/invite.php:101 ../../mod/wallmessage.php:9
@@ -1015,9 +1015,10 @@ msgstr "退消"
 #: ../../mod/message.php:38 ../../mod/message.php:174 ../../mod/mood.php:114
 #: ../../mod/network.php:6 ../../mod/notifications.php:66
 #: ../../mod/photos.php:133 ../../mod/photos.php:1044
-#: ../../mod/install.php:151 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:169 ../../mod/profile_photo.php:180
-#: ../../mod/profile_photo.php:193 ../../index.php:346
+#: ../../mod/install.php:151 ../../mod/contacts.php:147
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
+#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
+#: ../../index.php:346
 msgid "Permission denied."
 msgstr "权限不够。"
 
@@ -1183,297 +1184,297 @@ msgstr "能把优秀文章跟星标注"
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "找不到DNS信息为数据库服务器「%s」"
 
-#: ../../include/text.php:294
-msgid "prev"
-msgstr "上个"
-
-#: ../../include/text.php:296
-msgid "first"
-msgstr "首先"
-
-#: ../../include/text.php:325
-msgid "last"
-msgstr "最后"
-
-#: ../../include/text.php:328
-msgid "next"
-msgstr "下个"
-
-#: ../../include/text.php:352
+#: ../../include/text.php:293
 msgid "newer"
 msgstr "更新"
 
-#: ../../include/text.php:356
+#: ../../include/text.php:295
 msgid "older"
 msgstr "更旧"
 
-#: ../../include/text.php:807
+#: ../../include/text.php:300
+msgid "prev"
+msgstr "上个"
+
+#: ../../include/text.php:302
+msgid "first"
+msgstr "首先"
+
+#: ../../include/text.php:334
+msgid "last"
+msgstr "最后"
+
+#: ../../include/text.php:337
+msgid "next"
+msgstr "下个"
+
+#: ../../include/text.php:829
 msgid "No contacts"
 msgstr "没有熟人"
 
-#: ../../include/text.php:816
+#: ../../include/text.php:838
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d熟人"
 
-#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
+#: ../../include/text.php:850 ../../mod/viewcontacts.php:76
 msgid "View Contacts"
 msgstr "看熟人"
 
-#: ../../include/text.php:905 ../../include/text.php:906
+#: ../../include/text.php:927 ../../include/text.php:928
 #: ../../include/nav.php:118 ../../mod/search.php:99
 msgid "Search"
 msgstr "搜索"
 
-#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
+#: ../../include/text.php:930 ../../mod/notes.php:63 ../../mod/filer.php:31
 msgid "Save"
 msgstr "保存"
 
-#: ../../include/text.php:957
+#: ../../include/text.php:979
 msgid "poke"
 msgstr "戳"
 
-#: ../../include/text.php:957 ../../include/conversation.php:211
+#: ../../include/text.php:979 ../../include/conversation.php:211
 msgid "poked"
 msgstr "戳了"
 
-#: ../../include/text.php:958
+#: ../../include/text.php:980
 msgid "ping"
 msgstr "砰"
 
-#: ../../include/text.php:958
+#: ../../include/text.php:980
 msgid "pinged"
 msgstr "砰了"
 
-#: ../../include/text.php:959
+#: ../../include/text.php:981
 msgid "prod"
 msgstr "柔戳"
 
-#: ../../include/text.php:959
+#: ../../include/text.php:981
 msgid "prodded"
 msgstr "柔戳了"
 
-#: ../../include/text.php:960
+#: ../../include/text.php:982
 msgid "slap"
 msgstr "掌击"
 
-#: ../../include/text.php:960
+#: ../../include/text.php:982
 msgid "slapped"
 msgstr "掌击了"
 
-#: ../../include/text.php:961
+#: ../../include/text.php:983
 msgid "finger"
 msgstr "指"
 
-#: ../../include/text.php:961
+#: ../../include/text.php:983
 msgid "fingered"
 msgstr "指了"
 
-#: ../../include/text.php:962
+#: ../../include/text.php:984
 msgid "rebuff"
 msgstr "窝脖儿"
 
-#: ../../include/text.php:962
+#: ../../include/text.php:984
 msgid "rebuffed"
 msgstr "窝脖儿了"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:998
 msgid "happy"
 msgstr "开心"
 
-#: ../../include/text.php:977
+#: ../../include/text.php:999
 msgid "sad"
 msgstr "伤心"
 
-#: ../../include/text.php:978
+#: ../../include/text.php:1000
 msgid "mellow"
 msgstr "轻松"
 
-#: ../../include/text.php:979
+#: ../../include/text.php:1001
 msgid "tired"
 msgstr "累"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:1002
 msgid "perky"
 msgstr "机敏"
 
-#: ../../include/text.php:981
+#: ../../include/text.php:1003
 msgid "angry"
 msgstr "生气"
 
-#: ../../include/text.php:982
+#: ../../include/text.php:1004
 msgid "stupified"
 msgstr "麻醉"
 
-#: ../../include/text.php:983
+#: ../../include/text.php:1005
 msgid "puzzled"
 msgstr "纳闷"
 
-#: ../../include/text.php:984
+#: ../../include/text.php:1006
 msgid "interested"
 msgstr "有兴趣"
 
-#: ../../include/text.php:985
+#: ../../include/text.php:1007
 msgid "bitter"
 msgstr "苦"
 
-#: ../../include/text.php:986
+#: ../../include/text.php:1008
 msgid "cheerful"
 msgstr "快乐"
 
-#: ../../include/text.php:987
+#: ../../include/text.php:1009
 msgid "alive"
 msgstr "活着"
 
-#: ../../include/text.php:988
+#: ../../include/text.php:1010
 msgid "annoyed"
 msgstr "被烦恼"
 
-#: ../../include/text.php:989
+#: ../../include/text.php:1011
 msgid "anxious"
 msgstr "心焦"
 
-#: ../../include/text.php:990
+#: ../../include/text.php:1012
 msgid "cranky"
 msgstr "不稳"
 
-#: ../../include/text.php:991
+#: ../../include/text.php:1013
 msgid "disturbed"
 msgstr "不安"
 
-#: ../../include/text.php:992
+#: ../../include/text.php:1014
 msgid "frustrated"
 msgstr "被作梗"
 
-#: ../../include/text.php:993
+#: ../../include/text.php:1015
 msgid "motivated"
 msgstr "士气高涨"
 
-#: ../../include/text.php:994
+#: ../../include/text.php:1016
 msgid "relaxed"
 msgstr "轻松"
 
-#: ../../include/text.php:995
+#: ../../include/text.php:1017
 msgid "surprised"
 msgstr "诧异"
 
-#: ../../include/text.php:1163
+#: ../../include/text.php:1185
 msgid "Monday"
 msgstr "星期一"
 
-#: ../../include/text.php:1163
+#: ../../include/text.php:1185
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../../include/text.php:1163
+#: ../../include/text.php:1185
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../../include/text.php:1163
+#: ../../include/text.php:1185
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../../include/text.php:1163
+#: ../../include/text.php:1185
 msgid "Friday"
 msgstr "星期五"
 
-#: ../../include/text.php:1163
+#: ../../include/text.php:1185
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../../include/text.php:1163
+#: ../../include/text.php:1185
 msgid "Sunday"
 msgstr "星期天"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "January"
 msgstr "一月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "February"
 msgstr "二月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "March"
 msgstr "三月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "April"
 msgstr "四月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "May"
 msgstr "五月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "June"
 msgstr "六月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "July"
 msgstr "七月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "August"
 msgstr "八月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "September"
 msgstr "九月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "October"
 msgstr "十月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "November"
 msgstr "十一月"
 
-#: ../../include/text.php:1167
+#: ../../include/text.php:1189
 msgid "December"
 msgstr "十二月"
 
-#: ../../include/text.php:1323 ../../mod/videos.php:301
+#: ../../include/text.php:1345 ../../mod/videos.php:301
 msgid "View Video"
 msgstr "看视频"
 
-#: ../../include/text.php:1355
+#: ../../include/text.php:1377
 msgid "bytes"
 msgstr "字节"
 
-#: ../../include/text.php:1379 ../../include/text.php:1391
+#: ../../include/text.php:1401 ../../include/text.php:1413
 msgid "Click to open/close"
 msgstr "点击为开关"
 
-#: ../../include/text.php:1553 ../../mod/events.php:335
+#: ../../include/text.php:1575 ../../mod/events.php:335
 msgid "link to source"
 msgstr "链接到来源"
 
-#: ../../include/text.php:1608
+#: ../../include/text.php:1630
 msgid "Select an alternate language"
 msgstr "选择别的语言"
 
-#: ../../include/text.php:1860 ../../include/conversation.php:118
+#: ../../include/text.php:1882 ../../include/conversation.php:118
 #: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
 msgid "event"
 msgstr "项目"
 
-#: ../../include/text.php:1864
+#: ../../include/text.php:1886
 msgid "activity"
 msgstr "活动"
 
-#: ../../include/text.php:1866 ../../mod/content.php:628
+#: ../../include/text.php:1888 ../../mod/content.php:628
 #: ../../object/Item.php:364 ../../object/Item.php:377
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "评论"
 
-#: ../../include/text.php:1867
+#: ../../include/text.php:1889
 msgid "post"
 msgstr "文章"
 
-#: ../../include/text.php:2022
+#: ../../include/text.php:2044
 msgid "Item filed"
 msgstr "把项目归档了"
 
@@ -1996,7 +1997,7 @@ msgstr "这里没有什么新的"
 msgid "Clear notifications"
 msgstr "清理出通知"
 
-#: ../../include/nav.php:73 ../../boot.php:1136
+#: ../../include/nav.php:73 ../../boot.php:1140
 msgid "Logout"
 msgstr "注销"
 
@@ -2004,7 +2005,7 @@ msgstr "注销"
 msgid "End this session"
 msgstr "结束这段时间"
 
-#: ../../include/nav.php:76 ../../boot.php:1940
+#: ../../include/nav.php:76 ../../boot.php:1944
 msgid "Status"
 msgstr "现状"
 
@@ -2018,7 +2019,7 @@ msgid "Your profile page"
 msgstr "你的简介页"
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1954
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1958
 msgid "Photos"
 msgstr "照片"
 
@@ -2027,7 +2028,7 @@ msgid "Your photos"
 msgstr "你的照片"
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1971
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1975
 msgid "Events"
 msgstr "事件"
 
@@ -2043,7 +2044,7 @@ msgstr "私人的便条"
 msgid "Your personal photos"
 msgstr "你私人的照片"
 
-#: ../../include/nav.php:91 ../../boot.php:1137
+#: ../../include/nav.php:91 ../../boot.php:1141
 msgid "Login"
 msgstr "登录"
 
@@ -2060,7 +2061,7 @@ msgstr "主页"
 msgid "Home Page"
 msgstr "主页"
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1112
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1116
 msgid "Register"
 msgstr "注册"
 
@@ -2189,7 +2190,7 @@ msgstr "配置"
 msgid "Account settings"
 msgstr "帐户配置"
 
-#: ../../include/nav.php:169 ../../boot.php:1439
+#: ../../include/nav.php:169 ../../boot.php:1443
 msgid "Profiles"
 msgstr "简介"
 
@@ -2255,13 +2256,13 @@ msgstr "用户创造错误"
 msgid "User profile creation error"
 msgstr "用户简介创造错误"
 
-#: ../../include/uimport.php:202
+#: ../../include/uimport.php:206
 #, php-format
 msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
 msgstr[0] "%d熟人没进口了"
 
-#: ../../include/uimport.php:272
+#: ../../include/uimport.php:276
 msgid "Done. You can now login with your username and password"
 msgstr "完了。您现在会用您用户名和密码登录"
 
@@ -2409,17 +2410,17 @@ msgstr "剪辑简介消息"
 
 #: ../../mod/profiles.php:630 ../../mod/admin.php:491 ../../mod/admin.php:763
 #: ../../mod/admin.php:902 ../../mod/admin.php:1102 ../../mod/admin.php:1189
-#: ../../mod/contacts.php:386 ../../mod/settings.php:584
-#: ../../mod/settings.php:694 ../../mod/settings.php:763
-#: ../../mod/settings.php:837 ../../mod/settings.php:1064
-#: ../../mod/crepair.php:166 ../../mod/poke.php:199 ../../mod/events.php:478
-#: ../../mod/fsuggest.php:107 ../../mod/group.php:87 ../../mod/invite.php:140
-#: ../../mod/localtime.php:45 ../../mod/manage.php:110
-#: ../../mod/message.php:335 ../../mod/message.php:564 ../../mod/mood.php:137
-#: ../../mod/photos.php:1078 ../../mod/photos.php:1199
-#: ../../mod/photos.php:1501 ../../mod/photos.php:1552
-#: ../../mod/photos.php:1596 ../../mod/photos.php:1679
-#: ../../mod/install.php:248 ../../mod/install.php:286
+#: ../../mod/settings.php:584 ../../mod/settings.php:694
+#: ../../mod/settings.php:763 ../../mod/settings.php:837
+#: ../../mod/settings.php:1064 ../../mod/crepair.php:166
+#: ../../mod/poke.php:199 ../../mod/events.php:478 ../../mod/fsuggest.php:107
+#: ../../mod/group.php:87 ../../mod/invite.php:140 ../../mod/localtime.php:45
+#: ../../mod/manage.php:110 ../../mod/message.php:335
+#: ../../mod/message.php:564 ../../mod/mood.php:137 ../../mod/photos.php:1078
+#: ../../mod/photos.php:1199 ../../mod/photos.php:1501
+#: ../../mod/photos.php:1552 ../../mod/photos.php:1596
+#: ../../mod/photos.php:1679 ../../mod/install.php:248
+#: ../../mod/install.php:286 ../../mod/contacts.php:386
 #: ../../mod/content.php:733 ../../object/Item.php:653
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/config.php:152
@@ -2587,23 +2588,23 @@ msgstr "年纪："
 msgid "Edit/Manage Profiles"
 msgstr "编辑／管理简介"
 
-#: ../../mod/profiles.php:726 ../../boot.php:1445 ../../boot.php:1471
+#: ../../mod/profiles.php:726 ../../boot.php:1449 ../../boot.php:1475
 msgid "Change profile photo"
 msgstr "换简介照片"
 
-#: ../../mod/profiles.php:727 ../../boot.php:1446
+#: ../../mod/profiles.php:727 ../../boot.php:1450
 msgid "Create New Profile"
 msgstr "创造新的简介"
 
-#: ../../mod/profiles.php:738 ../../boot.php:1456
+#: ../../mod/profiles.php:738 ../../boot.php:1460
 msgid "Profile Image"
 msgstr "简介图像"
 
-#: ../../mod/profiles.php:740 ../../boot.php:1459
+#: ../../mod/profiles.php:740 ../../boot.php:1463
 msgid "visible to everybody"
 msgstr "给打假可见的"
 
-#: ../../mod/profiles.php:741 ../../boot.php:1460
+#: ../../mod/profiles.php:741 ../../boot.php:1464
 msgid "Edit visibility"
 msgstr "修改能见度"
 
@@ -2631,7 +2632,7 @@ msgstr "能见被"
 msgid "All Contacts (with secure profile access)"
 msgstr "所有熟人(跟安全地简介使用权)"
 
-#: ../../mod/notes.php:44 ../../boot.php:1978
+#: ../../mod/notes.php:44 ../../boot.php:1982
 msgid "Personal Notes"
 msgstr "私人便条"
 
@@ -2650,8 +2651,8 @@ msgstr "使用权这个简介被限制了."
 msgid "Item has been removed."
 msgstr "项目被删除了。"
 
-#: ../../mod/nogroup.php:40 ../../mod/contacts.php:395
-#: ../../mod/contacts.php:585 ../../mod/viewcontacts.php:62
+#: ../../mod/nogroup.php:40 ../../mod/viewcontacts.php:62
+#: ../../mod/contacts.php:395 ../../mod/contacts.php:585
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "看%s的简介[%s]"
@@ -3759,284 +3760,40 @@ msgstr "应用"
 msgid "No installed applications."
 msgstr "没有安装的应用"
 
-#: ../../mod/contacts.php:85 ../../mod/contacts.php:165
-msgid "Could not access contact record."
-msgstr "用不了熟人记录。"
+#: ../../mod/uimport.php:64
+msgid "Import"
+msgstr "进口"
 
-#: ../../mod/contacts.php:99
-msgid "Could not locate selected profile."
-msgstr "找不到选择的简介。"
+#: ../../mod/uimport.php:66
+msgid "Move account"
+msgstr "把账户搬出"
 
-#: ../../mod/contacts.php:122
-msgid "Contact updated."
-msgstr "熟人更新了。"
+#: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr "您会从别的Friendica服务器进口账户"
 
-#: ../../mod/contacts.php:124 ../../mod/dfrn_request.php:571
-msgid "Failed to update contact record."
-msgstr "更新熟人记录失败了。"
-
-#: ../../mod/contacts.php:187
-msgid "Contact has been blocked"
-msgstr "熟人拦了"
-
-#: ../../mod/contacts.php:187
-msgid "Contact has been unblocked"
-msgstr "熟人否拦了"
-
-#: ../../mod/contacts.php:201
-msgid "Contact has been ignored"
-msgstr "熟人不理了"
-
-#: ../../mod/contacts.php:201
-msgid "Contact has been unignored"
-msgstr "熟人否不理了"
-
-#: ../../mod/contacts.php:220
-msgid "Contact has been archived"
-msgstr "把联系存档了"
-
-#: ../../mod/contacts.php:220
-msgid "Contact has been unarchived"
-msgstr "把联系从存档拿来了"
-
-#: ../../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:301
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "您和%s是共同朋友们"
-
-#: ../../mod/contacts.php:305
-#, php-format
-msgid "You are sharing with %s"
-msgstr "您分享给%s"
-
-#: ../../mod/contacts.php:310
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s给您分享"
-
-#: ../../mod/contacts.php:327
-msgid "Private communications are not available for this contact."
-msgstr "没有私人的沟通跟这个熟人"
-
-#: ../../mod/contacts.php:334
-msgid "(Update was successful)"
-msgstr "(更新成功)"
-
-#: ../../mod/contacts.php:334
-msgid "(Update was not successful)"
-msgstr "(更新不成功)"
-
-#: ../../mod/contacts.php:336
-msgid "Suggest friends"
-msgstr "建议朋友们"
-
-#: ../../mod/contacts.php:340
-#, php-format
-msgid "Network type: %s"
-msgstr "网络种类: %s"
-
-#: ../../mod/contacts.php:348
-msgid "View all contacts"
-msgstr "看所有的熟人"
-
-#: ../../mod/contacts.php:356
-msgid "Toggle Blocked status"
-msgstr "交替拦配置"
-
-#: ../../mod/contacts.php:359 ../../mod/contacts.php:413
-msgid "Unignore"
-msgstr "停不理"
-
-#: ../../mod/contacts.php:359 ../../mod/contacts.php:413
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210
-msgid "Ignore"
-msgstr "忽视"
-
-#: ../../mod/contacts.php:362
-msgid "Toggle Ignored status"
-msgstr "交替忽视现状"
-
-#: ../../mod/contacts.php:366
-msgid "Unarchive"
-msgstr "从存档拿来"
-
-#: ../../mod/contacts.php:366
-msgid "Archive"
-msgstr "存档"
-
-#: ../../mod/contacts.php:369
-msgid "Toggle Archive status"
-msgstr "交替档案现状"
-
-#: ../../mod/contacts.php:372
-msgid "Repair"
-msgstr "维修"
-
-#: ../../mod/contacts.php:375
-msgid "Advanced Contact Settings"
-msgstr "专家熟人设置"
-
-#: ../../mod/contacts.php:381
-msgid "Communications lost with this contact!"
-msgstr "联系跟这个熟人断开了！"
-
-#: ../../mod/contacts.php:384
-msgid "Contact Editor"
-msgstr "熟人编器"
-
-#: ../../mod/contacts.php:387
-msgid "Profile Visibility"
-msgstr "简历可见量"
-
-#: ../../mod/contacts.php:388
-#, php-format
+#: ../../mod/uimport.php:68
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "请选择简介您想给%s显示他安全地看您的简介的时候。"
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also"
+" to inform your friends that you moved here."
+msgstr "您要把您老服务器账户出口才这里上传。我们重现您账户这里，包括所有您的熟人。我们再试通知您朋友们您搬到这里。"
 
-#: ../../mod/contacts.php:389
-msgid "Contact Information / Notes"
-msgstr "熟人信息／便条"
-
-#: ../../mod/contacts.php:390
-msgid "Edit contact notes"
-msgstr "编辑熟人便条"
-
-#: ../../mod/contacts.php:396
-msgid "Block/Unblock contact"
-msgstr "拦／否拦熟人"
-
-#: ../../mod/contacts.php:397
-msgid "Ignore contact"
-msgstr "忽视熟人"
-
-#: ../../mod/contacts.php:398
-msgid "Repair URL settings"
-msgstr "维修URL设置"
-
-#: ../../mod/contacts.php:399
-msgid "View conversations"
-msgstr "看交流"
-
-#: ../../mod/contacts.php:401
-msgid "Delete contact"
-msgstr "删除熟人"
-
-#: ../../mod/contacts.php:405
-msgid "Last update:"
-msgstr "上个更新："
-
-#: ../../mod/contacts.php:407
-msgid "Update public posts"
-msgstr "更新公开文章"
-
-#: ../../mod/contacts.php:416
-msgid "Currently blocked"
-msgstr "现在拦的"
-
-#: ../../mod/contacts.php:417
-msgid "Currently ignored"
-msgstr "现在不理的"
-
-#: ../../mod/contacts.php:418
-msgid "Currently archived"
-msgstr "现在存档着"
-
-#: ../../mod/contacts.php:419 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:204
-msgid "Hide this contact from others"
-msgstr "隐藏这个熟人给别人"
-
-#: ../../mod/contacts.php:419
+#: ../../mod/uimport.php:69
 msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "回答／喜欢关您公开文章<strong>会</strong>还可见的"
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
+msgstr "这个特点是在试验阶段。我们进口不了Ostatus网络(statusnet/identi.ca)或Diaspora熟人"
 
-#: ../../mod/contacts.php:470
-msgid "Suggestions"
-msgstr "建议"
+#: ../../mod/uimport.php:70
+msgid "Account file"
+msgstr "账户文件"
 
-#: ../../mod/contacts.php:473
-msgid "Suggest potential friends"
-msgstr "建议潜在朋友们"
-
-#: ../../mod/contacts.php:476 ../../mod/group.php:194
-msgid "All Contacts"
-msgstr "所有的熟人"
-
-#: ../../mod/contacts.php:479
-msgid "Show all contacts"
-msgstr "表示所有的熟人"
-
-#: ../../mod/contacts.php:482
-msgid "Unblocked"
-msgstr "不拦了"
-
-#: ../../mod/contacts.php:485
-msgid "Only show unblocked contacts"
-msgstr "只表示不拦的熟人"
-
-#: ../../mod/contacts.php:489
-msgid "Blocked"
-msgstr "拦了"
-
-#: ../../mod/contacts.php:492
-msgid "Only show blocked contacts"
-msgstr "只表示拦的熟人"
-
-#: ../../mod/contacts.php:496
-msgid "Ignored"
-msgstr "忽视的"
-
-#: ../../mod/contacts.php:499
-msgid "Only show ignored contacts"
-msgstr "只表示忽视的熟人"
-
-#: ../../mod/contacts.php:503
-msgid "Archived"
-msgstr "在存档"
-
-#: ../../mod/contacts.php:506
-msgid "Only show archived contacts"
-msgstr "只表示档案熟人"
-
-#: ../../mod/contacts.php:510
-msgid "Hidden"
-msgstr "隐藏的"
-
-#: ../../mod/contacts.php:513
-msgid "Only show hidden contacts"
-msgstr "只表示隐藏的熟人"
-
-#: ../../mod/contacts.php:561
-msgid "Mutual Friendship"
-msgstr "共同友谊"
-
-#: ../../mod/contacts.php:565
-msgid "is a fan of yours"
-msgstr "是您迷"
-
-#: ../../mod/contacts.php:569
-msgid "you are a fan of"
-msgstr "你喜欢"
-
-#: ../../mod/contacts.php:611
-msgid "Search your contacts"
-msgstr "搜索您的熟人"
-
-#: ../../mod/contacts.php:612 ../../mod/directory.php:59
-msgid "Finding: "
-msgstr "找着："
+#: ../../mod/uimport.php:70
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr "为出口您账户，点击「设置→出口您私人信息」和选择「出口账户」"
 
 #: ../../mod/settings.php:23 ../../mod/photos.php:79
 msgid "everybody"
@@ -4908,6 +4665,10 @@ msgstr "看上去您已经是%s的朋友。"
 msgid "Invalid profile URL."
 msgstr "无效的简介URL。"
 
+#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124
+msgid "Failed to update contact record."
+msgstr "更新熟人记录失败了。"
+
 #: ../../mod/dfrn_request.php:592
 msgid "Your introduction has been sent."
 msgstr "您的介绍发布了。"
@@ -5012,6 +4773,10 @@ msgstr "综合目录"
 msgid "Find on this site"
 msgstr "找在这网站"
 
+#: ../../mod/directory.php:59 ../../mod/contacts.php:612
+msgid "Finding: "
+msgstr "找着："
+
 #: ../../mod/directory.php:60
 msgid "Site Directory"
 msgstr "网站目录"
@@ -5184,41 +4949,6 @@ msgstr "出口您账户信息，熟人和别的项目成json。可能是很大
 msgid "- select -"
 msgstr "－选择－"
 
-#: ../../mod/uimport.php:64
-msgid "Import"
-msgstr "进口"
-
-#: ../../mod/uimport.php:66
-msgid "Move account"
-msgstr "把账户搬出"
-
-#: ../../mod/uimport.php:67
-msgid "You can import an account from another Friendica server."
-msgstr "您会从别的Friendica服务器进口账户"
-
-#: ../../mod/uimport.php:68
-msgid ""
-"You need to export your account from the old server and upload it here. We "
-"will recreate your old account here with all your contacts. We will try also"
-" to inform your friends that you moved here."
-msgstr "您要把您老服务器账户出口才这里上传。我们重现您账户这里，包括所有您的熟人。我们再试通知您朋友们您搬到这里。"
-
-#: ../../mod/uimport.php:69
-msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (statusnet/identi.ca) or from Diaspora"
-msgstr "这个特点是在试验阶段。我们进口不了Ostatus网络(statusnet/identi.ca)或Diaspora熟人"
-
-#: ../../mod/uimport.php:70
-msgid "Account file"
-msgstr "账户文件"
-
-#: ../../mod/uimport.php:70
-msgid ""
-"To export your accont, go to \"Settings->Export your porsonal data\" and "
-"select \"Export account\""
-msgstr "为出口您账户，点击「设置→出口您私人信息」和选择「出口账户」"
-
 #: ../../mod/update_community.php:18 ../../mod/update_display.php:22
 #: ../../mod/update_network.php:22 ../../mod/update_notes.php:41
 #: ../../mod/update_profile.php:41
@@ -5314,6 +5044,10 @@ msgstr "组编辑器"
 msgid "Members"
 msgstr "成员"
 
+#: ../../mod/group.php:194 ../../mod/contacts.php:476
+msgid "All Contacts"
+msgstr "所有的熟人"
+
 #: ../../mod/hcard.php:10
 msgid "No profile"
 msgstr "无简介"
@@ -5569,7 +5303,7 @@ msgid ""
 "Password reset failed."
 msgstr "要求确认不了。(您可能已经提交它。)重设密码失败了。"
 
-#: ../../mod/lostpass.php:84 ../../boot.php:1151
+#: ../../mod/lostpass.php:84 ../../boot.php:1155
 msgid "Password Reset"
 msgstr "复位密码"
 
@@ -5819,6 +5553,12 @@ msgstr "无效要求身份号。"
 msgid "Discard"
 msgstr "丢弃"
 
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:359
+#: ../../mod/contacts.php:413
+msgid "Ignore"
+msgstr "忽视"
+
 #: ../../mod/notifications.php:78
 msgid "System"
 msgstr "系统"
@@ -5844,6 +5584,11 @@ msgstr "朋友建议"
 msgid "suggested by %s"
 msgstr "由%s建议的"
 
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/contacts.php:419
+msgid "Hide this contact from others"
+msgstr "隐藏这个熟人给别人"
+
 #: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "Post a new friend activity"
 msgstr "表新朋友活动"
@@ -5953,7 +5698,7 @@ msgstr "没有别的家通信。"
 msgid "Home Notifications"
 msgstr "主页通知"
 
-#: ../../mod/photos.php:51 ../../boot.php:1957
+#: ../../mod/photos.php:51 ../../boot.php:1961
 msgid "Photo Albums"
 msgstr "相册"
 
@@ -6150,7 +5895,7 @@ msgstr "这是你"
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:670
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:674
 msgid "Comment"
 msgstr "评论"
 
@@ -6339,7 +6084,7 @@ msgid ""
 " features and resources."
 msgstr "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。"
 
-#: ../../mod/profile.php:21 ../../boot.php:1325
+#: ../../mod/profile.php:21 ../../boot.php:1329
 msgid "Requested profile is not available."
 msgstr "要求的简介联系不上的。"
 
@@ -6642,6 +6387,262 @@ msgid ""
 "poller."
 msgstr "重要：您要[手工地]准备安排的任务给喂器。"
 
+#: ../../mod/contacts.php:85 ../../mod/contacts.php:165
+msgid "Could not access contact record."
+msgstr "用不了熟人记录。"
+
+#: ../../mod/contacts.php:99
+msgid "Could not locate selected profile."
+msgstr "找不到选择的简介。"
+
+#: ../../mod/contacts.php:122
+msgid "Contact updated."
+msgstr "熟人更新了。"
+
+#: ../../mod/contacts.php:187
+msgid "Contact has been blocked"
+msgstr "熟人拦了"
+
+#: ../../mod/contacts.php:187
+msgid "Contact has been unblocked"
+msgstr "熟人否拦了"
+
+#: ../../mod/contacts.php:201
+msgid "Contact has been ignored"
+msgstr "熟人不理了"
+
+#: ../../mod/contacts.php:201
+msgid "Contact has been unignored"
+msgstr "熟人否不理了"
+
+#: ../../mod/contacts.php:220
+msgid "Contact has been archived"
+msgstr "把联系存档了"
+
+#: ../../mod/contacts.php:220
+msgid "Contact has been unarchived"
+msgstr "把联系从存档拿来了"
+
+#: ../../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:301
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "您和%s是共同朋友们"
+
+#: ../../mod/contacts.php:305
+#, php-format
+msgid "You are sharing with %s"
+msgstr "您分享给%s"
+
+#: ../../mod/contacts.php:310
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s给您分享"
+
+#: ../../mod/contacts.php:327
+msgid "Private communications are not available for this contact."
+msgstr "没有私人的沟通跟这个熟人"
+
+#: ../../mod/contacts.php:334
+msgid "(Update was successful)"
+msgstr "(更新成功)"
+
+#: ../../mod/contacts.php:334
+msgid "(Update was not successful)"
+msgstr "(更新不成功)"
+
+#: ../../mod/contacts.php:336
+msgid "Suggest friends"
+msgstr "建议朋友们"
+
+#: ../../mod/contacts.php:340
+#, php-format
+msgid "Network type: %s"
+msgstr "网络种类: %s"
+
+#: ../../mod/contacts.php:348
+msgid "View all contacts"
+msgstr "看所有的熟人"
+
+#: ../../mod/contacts.php:356
+msgid "Toggle Blocked status"
+msgstr "交替拦配置"
+
+#: ../../mod/contacts.php:359 ../../mod/contacts.php:413
+msgid "Unignore"
+msgstr "停不理"
+
+#: ../../mod/contacts.php:362
+msgid "Toggle Ignored status"
+msgstr "交替忽视现状"
+
+#: ../../mod/contacts.php:366
+msgid "Unarchive"
+msgstr "从存档拿来"
+
+#: ../../mod/contacts.php:366
+msgid "Archive"
+msgstr "存档"
+
+#: ../../mod/contacts.php:369
+msgid "Toggle Archive status"
+msgstr "交替档案现状"
+
+#: ../../mod/contacts.php:372
+msgid "Repair"
+msgstr "维修"
+
+#: ../../mod/contacts.php:375
+msgid "Advanced Contact Settings"
+msgstr "专家熟人设置"
+
+#: ../../mod/contacts.php:381
+msgid "Communications lost with this contact!"
+msgstr "联系跟这个熟人断开了！"
+
+#: ../../mod/contacts.php:384
+msgid "Contact Editor"
+msgstr "熟人编器"
+
+#: ../../mod/contacts.php:387
+msgid "Profile Visibility"
+msgstr "简历可见量"
+
+#: ../../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:389
+msgid "Contact Information / Notes"
+msgstr "熟人信息／便条"
+
+#: ../../mod/contacts.php:390
+msgid "Edit contact notes"
+msgstr "编辑熟人便条"
+
+#: ../../mod/contacts.php:396
+msgid "Block/Unblock contact"
+msgstr "拦／否拦熟人"
+
+#: ../../mod/contacts.php:397
+msgid "Ignore contact"
+msgstr "忽视熟人"
+
+#: ../../mod/contacts.php:398
+msgid "Repair URL settings"
+msgstr "维修URL设置"
+
+#: ../../mod/contacts.php:399
+msgid "View conversations"
+msgstr "看交流"
+
+#: ../../mod/contacts.php:401
+msgid "Delete contact"
+msgstr "删除熟人"
+
+#: ../../mod/contacts.php:405
+msgid "Last update:"
+msgstr "上个更新："
+
+#: ../../mod/contacts.php:407
+msgid "Update public posts"
+msgstr "更新公开文章"
+
+#: ../../mod/contacts.php:416
+msgid "Currently blocked"
+msgstr "现在拦的"
+
+#: ../../mod/contacts.php:417
+msgid "Currently ignored"
+msgstr "现在不理的"
+
+#: ../../mod/contacts.php:418
+msgid "Currently archived"
+msgstr "现在存档着"
+
+#: ../../mod/contacts.php:419
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "回答／喜欢关您公开文章<strong>会</strong>还可见的"
+
+#: ../../mod/contacts.php:470
+msgid "Suggestions"
+msgstr "建议"
+
+#: ../../mod/contacts.php:473
+msgid "Suggest potential friends"
+msgstr "建议潜在朋友们"
+
+#: ../../mod/contacts.php:479
+msgid "Show all contacts"
+msgstr "表示所有的熟人"
+
+#: ../../mod/contacts.php:482
+msgid "Unblocked"
+msgstr "不拦了"
+
+#: ../../mod/contacts.php:485
+msgid "Only show unblocked contacts"
+msgstr "只表示不拦的熟人"
+
+#: ../../mod/contacts.php:489
+msgid "Blocked"
+msgstr "拦了"
+
+#: ../../mod/contacts.php:492
+msgid "Only show blocked contacts"
+msgstr "只表示拦的熟人"
+
+#: ../../mod/contacts.php:496
+msgid "Ignored"
+msgstr "忽视的"
+
+#: ../../mod/contacts.php:499
+msgid "Only show ignored contacts"
+msgstr "只表示忽视的熟人"
+
+#: ../../mod/contacts.php:503
+msgid "Archived"
+msgstr "在存档"
+
+#: ../../mod/contacts.php:506
+msgid "Only show archived contacts"
+msgstr "只表示档案熟人"
+
+#: ../../mod/contacts.php:510
+msgid "Hidden"
+msgstr "隐藏的"
+
+#: ../../mod/contacts.php:513
+msgid "Only show hidden contacts"
+msgstr "只表示隐藏的熟人"
+
+#: ../../mod/contacts.php:561
+msgid "Mutual Friendship"
+msgstr "共同友谊"
+
+#: ../../mod/contacts.php:565
+msgid "is a fan of yours"
+msgstr "是您迷"
+
+#: ../../mod/contacts.php:569
+msgid "you are a fan of"
+msgstr "你喜欢"
+
+#: ../../mod/contacts.php:611
+msgid "Search your contacts"
+msgstr "搜索您的熟人"
+
 #: ../../mod/oexchange.php:25
 msgid "Post successful."
 msgstr "评论发表了。"
@@ -6978,128 +6979,128 @@ msgstr "文本区字体大小"
 msgid "toggle mobile"
 msgstr "交替手机"
 
-#: ../../boot.php:669
+#: ../../boot.php:673
 msgid "Delete this item?"
 msgstr "删除这个项目？"
 
-#: ../../boot.php:672
+#: ../../boot.php:676
 msgid "show fewer"
 msgstr "显示更小"
 
-#: ../../boot.php:999
+#: ../../boot.php:1003
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "更新%s美通过。看错误记录。"
 
-#: ../../boot.php:1001
+#: ../../boot.php:1005
 #, php-format
 msgid "Update Error at %s"
 msgstr "更新错误在%s"
 
-#: ../../boot.php:1111
+#: ../../boot.php:1115
 msgid "Create a New Account"
 msgstr "创造新的账户"
 
-#: ../../boot.php:1139
+#: ../../boot.php:1143
 msgid "Nickname or Email address: "
 msgstr "绰号或电子邮件地址: "
 
-#: ../../boot.php:1140
+#: ../../boot.php:1144
 msgid "Password: "
 msgstr "密码: "
 
-#: ../../boot.php:1141
+#: ../../boot.php:1145
 msgid "Remember me"
 msgstr "记住我"
 
-#: ../../boot.php:1144
+#: ../../boot.php:1148
 msgid "Or login using OpenID: "
 msgstr "或者用OpenID登记："
 
-#: ../../boot.php:1150
+#: ../../boot.php:1154
 msgid "Forgot your password?"
 msgstr "忘记你的密码吗？"
 
-#: ../../boot.php:1153
+#: ../../boot.php:1157
 msgid "Website Terms of Service"
 msgstr "网站的各项规定"
 
-#: ../../boot.php:1154
+#: ../../boot.php:1158
 msgid "terms of service"
 msgstr "各项规定"
 
-#: ../../boot.php:1156
+#: ../../boot.php:1160
 msgid "Website Privacy Policy"
 msgstr "网站隐私政策"
 
-#: ../../boot.php:1157
+#: ../../boot.php:1161
 msgid "privacy policy"
 msgstr "隐私政策"
 
-#: ../../boot.php:1286
+#: ../../boot.php:1290
 msgid "Requested account is not available."
 msgstr "要求的账户不可用。"
 
-#: ../../boot.php:1365 ../../boot.php:1469
+#: ../../boot.php:1369 ../../boot.php:1473
 msgid "Edit profile"
 msgstr "修改简介"
 
-#: ../../boot.php:1431
+#: ../../boot.php:1435
 msgid "Message"
 msgstr "通知"
 
-#: ../../boot.php:1439
+#: ../../boot.php:1443
 msgid "Manage/edit profiles"
 msgstr "管理/修改简介"
 
-#: ../../boot.php:1568 ../../boot.php:1654
+#: ../../boot.php:1572 ../../boot.php:1658
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../boot.php:1569 ../../boot.php:1655
+#: ../../boot.php:1573 ../../boot.php:1659
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1614 ../../boot.php:1695
+#: ../../boot.php:1618 ../../boot.php:1699
 msgid "[today]"
 msgstr "[今天]"
 
-#: ../../boot.php:1626
+#: ../../boot.php:1630
 msgid "Birthday Reminders"
 msgstr "提醒生日"
 
-#: ../../boot.php:1627
+#: ../../boot.php:1631
 msgid "Birthdays this week:"
 msgstr "这周的生日:"
 
-#: ../../boot.php:1688
+#: ../../boot.php:1692
 msgid "[No description]"
 msgstr "[无描述]"
 
-#: ../../boot.php:1706
+#: ../../boot.php:1710
 msgid "Event Reminders"
 msgstr "事件提醒"
 
-#: ../../boot.php:1707
+#: ../../boot.php:1711
 msgid "Events this week:"
 msgstr "这周的事件:"
 
-#: ../../boot.php:1943
+#: ../../boot.php:1947
 msgid "Status Messages and Posts"
 msgstr "现状通知和文章"
 
-#: ../../boot.php:1950
+#: ../../boot.php:1954
 msgid "Profile Details"
 msgstr "简介内容"
 
-#: ../../boot.php:1961 ../../boot.php:1964
+#: ../../boot.php:1965 ../../boot.php:1968
 msgid "Videos"
 msgstr "视频"
 
-#: ../../boot.php:1974
+#: ../../boot.php:1978
 msgid "Events and Calendar"
 msgstr "项目和日历"
 
-#: ../../boot.php:1981
+#: ../../boot.php:1985
 msgid "Only You Can See This"
 msgstr "只您许看这个"
diff --git a/view/zh-cn/strings.php b/view/zh-cn/strings.php
index 335b7511b2..84513b3b8d 100644
--- a/view/zh-cn/strings.php
+++ b/view/zh-cn/strings.php
@@ -273,12 +273,12 @@ $a->strings["Ability to dislike posts/comments"] = "能不喜欢文章／评论"
 $a->strings["Star Posts"] = "文章星";
 $a->strings["Ability to mark special posts with a star indicator"] = "能把优秀文章跟星标注";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "找不到DNS信息为数据库服务器「%s」";
+$a->strings["newer"] = "更新";
+$a->strings["older"] = "更旧";
 $a->strings["prev"] = "上个";
 $a->strings["first"] = "首先";
 $a->strings["last"] = "最后";
 $a->strings["next"] = "下个";
-$a->strings["newer"] = "更新";
-$a->strings["older"] = "更旧";
 $a->strings["No contacts"] = "没有熟人";
 $a->strings["%d Contact"] = array(
 	0 => "%d熟人",
@@ -865,73 +865,13 @@ $a->strings["No contacts in common."] = "没有共同熟人。";
 $a->strings["You must be logged in to use addons. "] = "您用插件前要登录";
 $a->strings["Applications"] = "应用";
 $a->strings["No installed applications."] = "没有安装的应用";
-$a->strings["Could not access contact record."] = "用不了熟人记录。";
-$a->strings["Could not locate selected profile."] = "找不到选择的简介。";
-$a->strings["Contact updated."] = "熟人更新了。";
-$a->strings["Failed to update contact record."] = "更新熟人记录失败了。";
-$a->strings["Contact has been blocked"] = "熟人拦了";
-$a->strings["Contact has been unblocked"] = "熟人否拦了";
-$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";
-$a->strings["%s is sharing with you"] = "%s给您分享";
-$a->strings["Private communications are not available for this contact."] = "没有私人的沟通跟这个熟人";
-$a->strings["(Update was successful)"] = "(更新成功)";
-$a->strings["(Update was not successful)"] = "(更新不成功)";
-$a->strings["Suggest friends"] = "建议朋友们";
-$a->strings["Network type: %s"] = "网络种类: %s";
-$a->strings["View all contacts"] = "看所有的熟人";
-$a->strings["Toggle Blocked status"] = "交替拦配置";
-$a->strings["Unignore"] = "停不理";
-$a->strings["Ignore"] = "忽视";
-$a->strings["Toggle Ignored status"] = "交替忽视现状";
-$a->strings["Unarchive"] = "从存档拿来";
-$a->strings["Archive"] = "存档";
-$a->strings["Toggle Archive status"] = "交替档案现状";
-$a->strings["Repair"] = "维修";
-$a->strings["Advanced Contact Settings"] = "专家熟人设置";
-$a->strings["Communications lost with this contact!"] = "联系跟这个熟人断开了！";
-$a->strings["Contact Editor"] = "熟人编器";
-$a->strings["Profile Visibility"] = "简历可见量";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "请选择简介您想给%s显示他安全地看您的简介的时候。";
-$a->strings["Contact Information / Notes"] = "熟人信息／便条";
-$a->strings["Edit contact notes"] = "编辑熟人便条";
-$a->strings["Block/Unblock contact"] = "拦／否拦熟人";
-$a->strings["Ignore contact"] = "忽视熟人";
-$a->strings["Repair URL settings"] = "维修URL设置";
-$a->strings["View conversations"] = "看交流";
-$a->strings["Delete contact"] = "删除熟人";
-$a->strings["Last update:"] = "上个更新：";
-$a->strings["Update public posts"] = "更新公开文章";
-$a->strings["Currently blocked"] = "现在拦的";
-$a->strings["Currently ignored"] = "现在不理的";
-$a->strings["Currently archived"] = "现在存档着";
-$a->strings["Hide this contact from others"] = "隐藏这个熟人给别人";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "回答／喜欢关您公开文章<strong>会</strong>还可见的";
-$a->strings["Suggestions"] = "建议";
-$a->strings["Suggest potential friends"] = "建议潜在朋友们";
-$a->strings["All Contacts"] = "所有的熟人";
-$a->strings["Show all contacts"] = "表示所有的熟人";
-$a->strings["Unblocked"] = "不拦了";
-$a->strings["Only show unblocked contacts"] = "只表示不拦的熟人";
-$a->strings["Blocked"] = "拦了";
-$a->strings["Only show blocked contacts"] = "只表示拦的熟人";
-$a->strings["Ignored"] = "忽视的";
-$a->strings["Only show ignored contacts"] = "只表示忽视的熟人";
-$a->strings["Archived"] = "在存档";
-$a->strings["Only show archived contacts"] = "只表示档案熟人";
-$a->strings["Hidden"] = "隐藏的";
-$a->strings["Only show hidden contacts"] = "只表示隐藏的熟人";
-$a->strings["Mutual Friendship"] = "共同友谊";
-$a->strings["is a fan of yours"] = "是您迷";
-$a->strings["you are a fan of"] = "你喜欢";
-$a->strings["Search your contacts"] = "搜索您的熟人";
-$a->strings["Finding: "] = "找着：";
+$a->strings["Import"] = "进口";
+$a->strings["Move account"] = "把账户搬出";
+$a->strings["You can import an account from another Friendica server."] = "您会从别的Friendica服务器进口账户";
+$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"] = "这个特点是在试验阶段。我们进口不了Ostatus网络(statusnet/identi.ca)或Diaspora熟人";
+$a->strings["Account file"] = "账户文件";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "为出口您账户，点击「设置→出口您私人信息」和选择「出口账户」";
 $a->strings["everybody"] = "每人";
 $a->strings["Additional features"] = "附加的特点";
 $a->strings["Display settings"] = "表示设置";
@@ -1144,6 +1084,7 @@ $a->strings["Unable to resolve your name at the provided location."] = "不可
 $a->strings["You have already introduced yourself here."] = "您已经自我介绍这儿。";
 $a->strings["Apparently you are already friends with %s."] = "看上去您已经是%s的朋友。";
 $a->strings["Invalid profile URL."] = "无效的简介URL。";
+$a->strings["Failed to update contact record."] = "更新熟人记录失败了。";
 $a->strings["Your introduction has been sent."] = "您的介绍发布了。";
 $a->strings["Please login to confirm introduction."] = "请登记为确认介绍。";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "错误的用户登记者。请用<strong>这个</strong>用户。";
@@ -1166,6 +1107,7 @@ $a->strings["Submit Request"] = "提交要求";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s关注着%2\$s的%3\$s";
 $a->strings["Global Directory"] = "综合目录";
 $a->strings["Find on this site"] = "找在这网站";
+$a->strings["Finding: "] = "找着：";
 $a->strings["Site Directory"] = "网站目录";
 $a->strings["Gender: "] = "性别：";
 $a->strings["No entries (some entries may be hidden)."] = "没有文章(有的文章会被隐藏)。";
@@ -1207,13 +1149,6 @@ $a->strings["Export your account info and contacts. Use this to make a backup of
 $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["- select -"] = "－选择－";
-$a->strings["Import"] = "进口";
-$a->strings["Move account"] = "把账户搬出";
-$a->strings["You can import an account from another Friendica server."] = "您会从别的Friendica服务器进口账户";
-$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"] = "这个特点是在试验阶段。我们进口不了Ostatus网络(statusnet/identi.ca)或Diaspora熟人";
-$a->strings["Account file"] = "账户文件";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "为出口您账户，点击「设置→出口您私人信息」和选择「出口账户」";
 $a->strings["[Embedded content - reload page to view]"] = "[嵌入内容－重新加载页为看]";
 $a->strings["Contact added"] = "熟人添了";
 $a->strings["This is Friendica, version"] = "这是Friendica，版本";
@@ -1236,6 +1171,7 @@ $a->strings["Group removed."] = "组删除了。";
 $a->strings["Unable to remove group."] = "不能删除组。";
 $a->strings["Group Editor"] = "组编辑器";
 $a->strings["Members"] = "成员";
+$a->strings["All Contacts"] = "所有的熟人";
 $a->strings["No profile"] = "无简介";
 $a->strings["Help:"] = "帮助：";
 $a->strings["Not Found"] = "未发现";
@@ -1353,12 +1289,14 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "无效熟人。";
 $a->strings["Invalid request identifier."] = "无效要求身份号。";
 $a->strings["Discard"] = "丢弃";
+$a->strings["Ignore"] = "忽视";
 $a->strings["System"] = "系统";
 $a->strings["Show Ignored Requests"] = "显示不理的要求";
 $a->strings["Hide Ignored Requests"] = "隐藏不理的要求";
 $a->strings["Notification type: "] = "通知种类：";
 $a->strings["Friend Suggestion"] = "朋友建议";
 $a->strings["suggested by %s"] = "由%s建议的";
+$a->strings["Hide this contact from others"] = "隐藏这个熟人给别人";
 $a->strings["Post a new friend activity"] = "表新朋友活动";
 $a->strings["if applicable"] = "或适用";
 $a->strings["Claims to be known to you: "] = "声称被您认识：";
@@ -1529,6 +1467,68 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "造成数据库列表相遇错误。";
 $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["Could not access contact record."] = "用不了熟人记录。";
+$a->strings["Could not locate selected profile."] = "找不到选择的简介。";
+$a->strings["Contact updated."] = "熟人更新了。";
+$a->strings["Contact has been blocked"] = "熟人拦了";
+$a->strings["Contact has been unblocked"] = "熟人否拦了";
+$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";
+$a->strings["%s is sharing with you"] = "%s给您分享";
+$a->strings["Private communications are not available for this contact."] = "没有私人的沟通跟这个熟人";
+$a->strings["(Update was successful)"] = "(更新成功)";
+$a->strings["(Update was not successful)"] = "(更新不成功)";
+$a->strings["Suggest friends"] = "建议朋友们";
+$a->strings["Network type: %s"] = "网络种类: %s";
+$a->strings["View all contacts"] = "看所有的熟人";
+$a->strings["Toggle Blocked status"] = "交替拦配置";
+$a->strings["Unignore"] = "停不理";
+$a->strings["Toggle Ignored status"] = "交替忽视现状";
+$a->strings["Unarchive"] = "从存档拿来";
+$a->strings["Archive"] = "存档";
+$a->strings["Toggle Archive status"] = "交替档案现状";
+$a->strings["Repair"] = "维修";
+$a->strings["Advanced Contact Settings"] = "专家熟人设置";
+$a->strings["Communications lost with this contact!"] = "联系跟这个熟人断开了！";
+$a->strings["Contact Editor"] = "熟人编器";
+$a->strings["Profile Visibility"] = "简历可见量";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "请选择简介您想给%s显示他安全地看您的简介的时候。";
+$a->strings["Contact Information / Notes"] = "熟人信息／便条";
+$a->strings["Edit contact notes"] = "编辑熟人便条";
+$a->strings["Block/Unblock contact"] = "拦／否拦熟人";
+$a->strings["Ignore contact"] = "忽视熟人";
+$a->strings["Repair URL settings"] = "维修URL设置";
+$a->strings["View conversations"] = "看交流";
+$a->strings["Delete contact"] = "删除熟人";
+$a->strings["Last update:"] = "上个更新：";
+$a->strings["Update public posts"] = "更新公开文章";
+$a->strings["Currently blocked"] = "现在拦的";
+$a->strings["Currently ignored"] = "现在不理的";
+$a->strings["Currently archived"] = "现在存档着";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "回答／喜欢关您公开文章<strong>会</strong>还可见的";
+$a->strings["Suggestions"] = "建议";
+$a->strings["Suggest potential friends"] = "建议潜在朋友们";
+$a->strings["Show all contacts"] = "表示所有的熟人";
+$a->strings["Unblocked"] = "不拦了";
+$a->strings["Only show unblocked contacts"] = "只表示不拦的熟人";
+$a->strings["Blocked"] = "拦了";
+$a->strings["Only show blocked contacts"] = "只表示拦的熟人";
+$a->strings["Ignored"] = "忽视的";
+$a->strings["Only show ignored contacts"] = "只表示忽视的熟人";
+$a->strings["Archived"] = "在存档";
+$a->strings["Only show archived contacts"] = "只表示档案熟人";
+$a->strings["Hidden"] = "隐藏的";
+$a->strings["Only show hidden contacts"] = "只表示隐藏的熟人";
+$a->strings["Mutual Friendship"] = "共同友谊";
+$a->strings["is a fan of yours"] = "是您迷";
+$a->strings["you are a fan of"] = "你喜欢";
+$a->strings["Search your contacts"] = "搜索您的熟人";
 $a->strings["Post successful."] = "评论发表了。";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID协议错误。没ID还。 ";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "找不到账户和OpenID注册不允许。";