Merge branch 'master' into dev

lang/zh-CN.json

@@ -3,8 +3,8 @@
     "label.add-account": "添加账户",
     "label.add-website": "添加网站",
     "label.administrator": "管理员",
-  "label.all": "All",
-  "label.all-websites": "All websites",
+    "label.all": "所有",
+    "label.all-websites": "全部网站",
     "label.back": "返回",
     "label.cancel": "取消",
     "label.change-password": "更新密码",
@@ -18,7 +18,7 @@
     "label.delete": "删除",
     "label.delete-account": "删除账户",
     "label.delete-website": "删除网站",
-  "label.dismiss": "Dismiss",
+    "label.dismiss": "关闭",
     "label.domain": "域名",
     "label.edit": "编辑",
     "label.edit-account": "编辑账户",
@@ -37,8 +37,8 @@
     "label.password": "密码",
     "label.passwords-dont-match": "密码不一致",
     "label.profile": "个人资料",
-  "label.realtime": "Realtime",
-  "label.realtime-logs": "Realtime logs",
+    "label.realtime": "实时",
+    "label.realtime-logs": "实时日志",
     "label.refresh": "刷新",
     "label.required": "必填",
     "label.reset": "重置",
@@ -65,8 +65,8 @@
     "message.get-tracking-code": "获得跟踪代码",
     "message.go-to-settings": "去设置",
     "message.incorrect-username-password": "用户名密码不正确.",
-  "message.log.visitor": "Visitor from {country} using {browser} on {os} {device}",
-  "message.new-version-available": "A new version of umami {version} is available!",
+    "message.log.visitor": "来自 {country} 的访客在搭载 {os} 的 {device} 上使用 {browser} 进行访问.",
+    "message.new-version-available": "umami 有新版本 {version} 发布啦！",
     "message.no-data-available": "无可用数据.",
     "message.no-websites-configured": "你还没有设置任何网站.",
     "message.page-not-found": "网页未找到.",