Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap

BlueMapCommon/webapp/public/lang/zh_CN.conf

@@ -4,6 +4,11 @@
     title: "菜单"
     tooltip: "打开菜单"
   }
+  map: {
+    unloaded: "未加载地图."
+    loading: "正在加载地图..."
+    errored: "尝试加载此地图时出错！"
+  }
   maps: {
     title: "地图"
     button: "地图"
@@ -17,6 +22,14 @@
     markerSet: "标记集 | 标记集"
     searchPlaceholder: "搜索..."
     followPlayerTitle: "跟随玩家"
+    sort {
+      title: "排序方式"
+      by {
+        default: "默认"
+        label: "名称"
+        distance: "距离"
+      }
+    }
   }
   settings: {
     title: "设置"
@@ -27,7 +40,7 @@
   }
   resetCamera: {
     button: "重置镜头"
-    tooltip: "重置镜头 & 位置"
+    tooltip: "重置镜头和位置"
   }
   updateMap: {
     button: "更新地图"
@@ -47,15 +60,21 @@
     normal: "普通（默认 x1）"
     low: "低（粗糙 x0.5）"
   }
+  mapControls: {
+    title: "地图控制"
+    showZoomButtons: "显示缩放按钮"
+  }
   freeFlightControls: {
     title: "自由飞行控制"
     mouseSensitivity: "鼠标灵敏度"
-    invertMouseY: "反转鼠标 Y"
+    invertMouseY: "反转鼠标 Y 轴"
   }
   renderDistance: {
     title: "渲染距离"
     hiresLayer: "高分辨率"
     lowersLayer: "低分辨率"
+    loadHiresWhileMoving: "移动时加载高清图像"
+    off: "关闭"
   }
   theme: {
     title: "主题"
@@ -75,7 +94,7 @@
     tooltip: "玩家列表"
   }
   compass: {
-    tooltip: "罗盘 / 朝北"
+    tooltip: "指南针 / 朝北"
   }
   screenshot: {
     title: "截图"
@@ -122,9 +141,9 @@
 <p>
 	<h2>鼠标控制:</h2>
 	<table>
-		<tr><th>移动</th><td><kbd>左键</kbd> + 拖拽</td></tr>
-		<tr><th>缩放</th><td><kbd>鼠标中键</kbd> (滚动)</td></tr>
-		<tr><th>旋转 / 倾斜</th><td><kbd>右键</kbd> + 拖拽</td></tr>
+		<tr><th>移动</th><td><kbd>左键点击</kbd> + 拖动</td></tr>
+		<tr><th>缩放</th><td><kbd>鼠标滚轮</kbd>（滚动）</td></tr>
+		<tr><th>旋转 / 倾斜</th><td><kbd>右键点击</kbd> + 拖动</td></tr>
 	</table>
 </p>
 <p>
@@ -138,8 +157,8 @@
 <p>
 	<h2>触屏控制:</h2>
 	<table>
-		<tr><th>移动</th><td>触屏 + 拖拽</td></tr>
-		<tr><th>缩放</th><td>双指触屏 + 滑动</td></tr>
+		<tr><th>移动</th><td>触屏 + 拖动</td></tr>
+		<tr><th>缩放</th><td>双指触屏 + 捏合</td></tr>
 		<tr><th>旋转 / 倾斜</th><td>双指触屏 + 旋转 / 向上滑动 / 向下滑动</td></tr>
 	</table>
 </p>