Merge pull request #408 from zhang-yuan/master

Translation fixed
leanote · Aug 26, 2016 · 5dc929c · 5dc929c
2 parents a4d6a99 + 2a7d1fe
commit 5dc929c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/messages/en-us/blog.conf b/messages/en-us/blog.conf
@@ -67,17 +67,17 @@ confirm=Confirm
 signIn=Sign In
 signUp=Sign Up
 submitComment=Submit
-reportReason1=不友善内容
-reportReason2=广告等垃圾信息
-reportReason3=违法违规内容
-reportReason4=不宜公开讨论的政治内容
+reportReason1=Unfriendly content
+reportReason2=Advertising and other spam
+reportReason3=Illegal content
+reportReason4=Public discussion of political content
 other=Other
 reportReason=Reason
-chooseReason=请选择举报理由
-reportSuccess=举报成功, 我们处理后会通知作者, 感谢您的监督
+chooseReason=Select report reason
+reportSuccess=Reporting success, we will notify the author, thank you for your monitor
 error=Error
-reportComment?=举报该评论?
-reportBlog?=举报该博客?
+reportComment?=Report this comment?
+reportBlog?=Report this blog?
 confirmDeleteComment=Are you sure?
 scanQRCode=Open weichat and scan the QR code
 justNow=Just now
@@ -88,4 +88,4 @@ weeksAgo=weeks ago
 monthsAgo=months ago
 
 
-a=a
+a=a
diff --git a/messages/en-us/msg.conf b/messages/en-us/msg.conf
@@ -91,7 +91,7 @@ editorTipsInfo=<h4>1. Short cuts</h4>ctrl+shift+c Toggle code<h4>2. shift+enter
 newNote=New note
 newMarkdownNote=New Markdown Note
 noNoteNewNoteTips=The notebook is empty, why not...
-canntNewNoteTips=Sorry, cannot new note in here, please choose a notebook at first.
+canntNewNoteTips=Sorry, you can't add notes here, please choose a notebook first.
 new=New
 newMarkdown=New markdown note
 clickAddTag=Click to add Tag