From dde0da26c7b8dcd0cb9419e2e04b0285b2cd0045 Mon Sep 17 00:00:00 2001
From: vcoppe <vianney.coppe@uclouvain.be>
Date: Mon, 6 Jan 2025 11:28:16 +0100
Subject: [PATCH] New translations en.json (Chinese Simplified)

---
 website/src/locales/zh.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/src/locales/zh.json b/website/src/locales/zh.json
index 570aad16..b45baba4 100644
--- a/website/src/locales/zh.json
+++ b/website/src/locales/zh.json
@@ -215,7 +215,7 @@
             "merge_contents": "合并但保持轨迹独立",
             "merge_selection": "合并",
             "remove_gaps": "删除轨迹间的时间间隔",
-            "tooltip": "合并",
+            "tooltip": "合并要素",
             "help_merge_traces": "连接所选内容并生成一个连续轨迹。",
             "help_cannot_merge_traces": "须先选择多个文件以合并，",
             "help_merge_contents": "合并所选内容并将结果存储于第一个文件。",
@@ -234,7 +234,7 @@
             "help_no_selection": "选择要请求海拔数据的文件。"
         },
         "waypoint": {
-            "tooltip": "创建并编辑兴趣点",
+            "tooltip": "创建或编辑兴趣点",
             "icon": "图标",
             "link": "链接",
             "longitude": "经度",