Merge branch 'master' into 'master'

updated some zh_cn translations



See merge request !6

locale/zh_cn.json

@@ -115,19 +115,19 @@
 	"FAQ": "FAQ",
 	"inviteAFriend": "邀请好友",
 	"goToExternalProfile": "前往完整的个人档案",
-	"cropAndSave": "Crop and save",
-	"showTerms": "Read our Terms of Use",
-	"ellipsisMore": "More",
-	"blockUser": "Block {username}",
+	"cropAndSave": "裁剪并保存",
+	"showTerms": "查看我们的使用条例",
+	"ellipsisMore": "更多",
+	"blockUser": "屏蔽 {username}",
 	"goToOriginalNotice": "Go to original notice",
 	"goToTheUsersRemoteProfile": "Go to the user's remote profile",
 	"clickToDrag":"Click to drag",
-	"keyboardShortcuts":"Keyboard shortcuts",
+	"keyboardShortcuts":"键盘快捷键",
 	"classicInterface":"Classic {site-title}",
 	"accessibilityToggleLink":"For better accessibility, click this link to switch to the classic interface",
 	"tooltipBookmarkStream":"Add this stream to your bookmarks",
 	"tooltipTopMenu":"Menu and settings",
-	"tooltipAttachImage":"Attach an image",
+	"tooltipAttachImage":"附加一张图片",
 	"tooltipShortenUrls":"Shorten all URLs in the Queet",
 	"tooltipReloadStream":"Refresh this stream",
 	"tooltipRemoveBookmark":"Remove this bookmark",
@@ -142,22 +142,22 @@
 	"hideRepliesToPeopleIDoNotFollow":"Hide replies to people I don't follow",
 	"markAllNotificationsAsSeen":"Mark all notifications as seen",
 	"notifyRepliesAndMentions":"Mentions and replies",
-	"notifyFavs":"Favorites",
-	"notifyRepeats":"Requeets",
-	"notifyFollows":"New followers",
-	"timelineOptions":"Timeline options",
+	"notifyFavs":"收藏",
+	"notifyRepeats":"转推",
+	"notifyFollows":"新的关注者",
+	"timelineOptions":"时间轴选项",
 	"ERRORfailedSavingYourSetting":"Failed saving your setting",
 	"ERRORfailedMarkingAllNotificationsAsRead":"Failed marking all notifications as seen.",
-	"newNotification": "{new-notice-count} new notification",
-	"newNotifications": "{new-notice-count} new notifications",
-	"thisIsANoticeFromABlockedUser":"Warning: This is a notice from a user you have blocked. Click to show it.",
-	"nicknamesListWithListName":"{nickname}’s list: {list-name}",
-	"myListWithListName":"My list: {list-name}",
-	"listMembers":"Members",
-	"listSubscribers":"Subscribers",
-	"ERRORcouldNotFindList":"There is no such list.",
-	"emailAlreadyInUse":"Already in use",
-	"addEditLanguageLink":"Help translate {site-title} to another language",
+	"newNotification": "{new-notice-count} 新通知",
+	"newNotifications": "{new-notice-count} 新通知",
+	"thisIsANoticeFromABlockedUser":"注意：这是一条来自你屏蔽的用户的推文。点击以查看。",
+	"nicknamesListWithListName":"{nickname}的列表： {list-name}",
+	"myListWithListName":"我的列表： {list-name}",
+	"listMembers":"成员",
+	"listSubscribers":"订阅者",
+	"ERRORcouldNotFindList":"找不到这个列表",
+	"emailAlreadyInUse":"已经被使用了",
+	"addEditLanguageLink":"帮助翻译 {site-title} 到其他语言",
 	"onlyPartlyTranslated":"{site-title} is only partly translated to <em>{language-name}</em> ({percent}%). You can help complete the translation at <a href=\"https://git.gnu.io/h2p/Qvitter/tree/master/locale\">Qvitter's repository homepage</a>",
 	"startRant":"Start a rant",
 	"continueRant":"Continue the rant",