Merge branch 'master' of https://github.com/wozboz/dashy

Lissy93 · Aug 10, 2023 · be0f51d · be0f51d
2 parents f7a0fb2 + ce4e71b
commit be0f51d
Show file tree

Hide file tree

Showing 5 changed files with 139 additions and 92 deletions.
diff --git a/.github/AUTHORS.txt b/.github/AUTHORS.txt
@@ -126,9 +126,9 @@ Marcell Fülöp <[email protected]> - 27 commits
 Alicia Sykes <[email protected]> - 28 commits
 Lissy93 <[email protected]> - 78 commits
 snyk-bot <[email protected]> - 81 commits
-repo-visualizer <[email protected]> - 96 commits
-liss-bot <liss-bot@d0h.co> - 178 commits
-Alicia Bot <87835202+liss-bot@users.noreply.github.com> - 179 commits
+repo-visualizer <[email protected]> - 97 commits
+Alicia Bot <87835202+liss-bot@users.noreply.github.com> - 180 commits
+liss-bot <liss-bot@d0h.co> - 180 commits
 Lissy93 <[email protected]> - 210 commits
 Alicia Sykes <[email protected]> - 325 commits
 Alicia Sykes <[email protected]> - 440 commits

diff --git a/README.md b/README.md
@@ -610,7 +610,7 @@ Huge thanks to the sponsors helping to support Dashy's development!
     </td>
     <td align="center">
         <a href="https://github.com/MikaPST">
-            <img src="https://avatars.githubusercontent.com/u/56961056?v=4" width="80;" alt="MikaPST"/>
+            <img src="https://avatars.githubusercontent.com/u/56961056?u=3da81a03cbe66a03bbb4afbf2751d71b7a94e28f&v=4" width="80;" alt="MikaPST"/>
             <br />
             <sub><b>Michaël</b></sub>
         </a>

diff --git a/docs/assets/repo-visualization.svg b/docs/assets/repo-visualization.svg
diff --git a/docs/credits.md b/docs/credits.md
@@ -84,7 +84,7 @@
     </td>
     <td align="center">
         <a href="https://github.com/MikaPST">
-            <img src="https://avatars.githubusercontent.com/u/56961056?v=4" width="80;" alt="MikaPST"/>
+            <img src="https://avatars.githubusercontent.com/u/56961056?u=3da81a03cbe66a03bbb4afbf2751d71b7a94e28f&v=4" width="80;" alt="MikaPST"/>
             <br />
             <sub><b>Michaël</b></sub>
         </a>

diff --git a/src/assets/locales/zh-CN.json b/src/assets/locales/zh-CN.json
@@ -10,6 +10,9 @@
     "clear-search-tooltip": "清空搜索",
     "enter-to-search-web": "点击回车搜索"
   },
+  "splash-screen": {
+    "loading": "加载中"
+  },
   "login": {
     "title": "Dashy",
     "guest-label": "访客访问",
@@ -41,6 +44,37 @@
     "logged-in-guest": "以访客身份登陆,正在跳转...",
     "error-guest-access": "不允许访客访问"
   },
+  "app-info": {
+    "title": "应用信息",
+    "error-log": "错误日志",
+    "no-errors": "未检测到最近的错误",
+    "help-support": "帮助与支持",
+    "help-support-description": "如需有关Dashy运行或配置的支持，请查看",
+    "help-support-discussions": "讨论",
+    "support-dashy": "支持Dashy",
+    "support-dashy-description": "了解参与Dashy项目的方式，请查看",
+    "support-dashy-link": "贡献页面",
+    "report-bug": "报告漏洞",
+    "report-bug-description": "如果您认为发现了漏洞，请",
+    "report-bug-link": "提交问题",
+    "more-info": "更多信息",
+    "source": "源代码",
+    "documentation": "文档",
+    "privacy-and-security": "隐私与安全",
+    "privacy-and-security-l1": "关于Dashy如何管理您的数据的详细信息，请参阅",
+    "privacy-and-security-privacy-policy": "隐私政策",
+    "app-info.privacy-and-security-advice": "如果您需要保护您的仪表盘，请参考",
+    "app-info.privacy-and-security-advice-link": "管理文档",
+    "privacy-and-security-security-issue": "如果您发现潜在的安全问题，请遵循我们的",
+    "privacy-and-security-security-policy": "安全政策",
+    "license": "许可证",
+    "license-under": "根据许可证授权",
+    "licence-third-party": "有关第三方模块的许可证，请参阅",
+    "licence-third-party-link": "法律信息",
+    "list-contributors": "查看所有贡献者和致谢的完整列表，请查看",
+    "list-contributors-link": "致谢",
+    "version": "版本"
+  },
   "config": {
     "main-tab": "主菜单",
     "view-config-tab": "视图设置",
@@ -55,6 +89,8 @@
     "rebuild-app-button": "重建应用",
     "change-language-button": "更改语言",
     "reset-settings-button": "恢复本地设置",
+    "disabled-note": "您的管理员已禁用某些配置功能",
+    "small-screen-note": "您正在使用非常小的屏幕，某些菜单屏幕可能不够优化",
     "app-info-button": "应用详情",
     "backup-note": "建议在进行更改之前备份你的配置。",
     "reset-config-msg-l1": "这将从本地存储中删除所有用户设置，但不会影响‘conf.yml’文件。",
@@ -69,7 +105,11 @@
     "css-note-label": "注意",
     "css-note-l1": "你需要刷新页面才能使更改生效。",
     "css-note-l2": "样式覆盖仅存储在本地，因此建议复制你的 CSS。",
-    "css-note-l3": "要删除所有自定义样式，请删除内容并点击保存更改"
+    "css-note-l3": "要删除所有自定义样式，请删除内容并点击保存更改",
+    "custom-css": {
+      "title": "自定义 CSS",
+      "base-theme": "基础主题"
+    }
   },
   "alternate-views": {
     "alternate-view-heading": "切换视图",
@@ -91,7 +131,9 @@
     "config-launcher-tooltip": "更新设置",
     "sign-out-tooltip": "注销",
     "sign-in-tooltip": "登陆",
-    "sign-in-welcome": "你好 {username}！"
+    "sign-in-welcome": "你好 {username}！",
+    "hide": "Hide",
+    "open": "Open"
   },
   "updates": {
     "app-version-note": "Dashy 版本",
@@ -155,7 +197,7 @@
   "cloud-sync": {
     "title": "云备份 & 云恢复",
     "intro-l1": "云备份和云恢复是一项试验性功能，你将配置上传到网络，然后在其他设备或 Dashy 实例上恢复。",
-    "intro-l2": "所有数据都使用 AES 端到端加密，使用你的密码作为密钥。",
+    "intro-l2": "所有数据都使用AES端对端加密，使用你的密码作为密钥。",
     "intro-l3": "有关更多信息，请参阅",
     "backup-title-setup": "创建备份",
     "backup-title-update": "更新备份",
@@ -207,7 +249,13 @@
       "move-section": "移动到",
       "remove-section": "删除"
     }
-},
+  },
+  "footer": {
+    "dev-by": "开发者：",
+    "licensed-under": "许可证授权：",
+    "get-the": "获取",
+    "source-code": "源代码"
+  },
   "interactive-editor": {
     "menu": {
       "start-editing-tooltip": "进入交互编辑器",
@@ -312,87 +360,86 @@
       "up": "上行",
       "down": "下行"
     },
-      "gluetun-status": {
-        "vpn-ip": "VPN IP",
-        "country": "国家",
-        "region": "地区",
-        "city": "城市",
-        "post-code": "邮编",
-        "location": "位置",
-        "timezone": "时区",
-        "organization": "组织"
-      },
-      "nextcloud": {
-        "active": "激活",
-        "and": "和",
-        "applications": "应用程序",
-        "available": "存在",
-        "away": "离开",
-        "cache-full": "缓存已满",
-        "chat-room": "聊天室",
-        "delete-all": "全部删除",
-        "delete-notification": "删除通知",
-        "disabled": "已禁用",
-        "disk-quota": "磁盘配额",
-        "disk-space": "磁盘空间",
-        "dnd": "请勿打扰",
-        "email": "邮箱",
-        "enabled": "已启用",
-        "federated-shares-ucfirst": "Federated shares",
-        "federated-shares": "federated shares",
-        "files": "文件{plural}",
-        "free": "可用",
-        "groups": "组",
-        "hit-rate": "命中率",
-        "hits": "命中",
-        "home": "home",
-        "in": "in",
-        "keys": "keys",
-        "last-24-hours": "24 小时内",
-        "last-5-minutes": "5 分钟内",
-        "last-hour": "1 小时内",
-        "last-login": "最后登陆",
-        "last-restart": "最后重启",
-        "load-averages": "所有CPU的平均负载",
-        "local-shares": "本地分享",
-        "local": "本地",
-        "max-keys": "max keys",
-        "memory-used": "已用内存",
-        "memory-utilisation": "内存使用率",
-        "memory": "内存",
-        "misses": "misses",
-        "no-notifications": "暂无通知",
-        "no-pending-updates": "没有挂起的更新",
-        "nothing-to-show": "当前没有可展示的内容",
-        "of-which": "of which",
-        "of": "of",
-        "offline": "离线",
-        "online": "在线",
-        "other": "其他",
-        "overall": "Overall",
-        "private-link": "私有链接",
-        "public-link": "公开链接",
-        "quota-enabled": "这个用户{not}启用磁盘配额",
-        "received": "已收到",
-        "scripts": "脚本",
-        "sent": "发送",
-        "started": "已开始",
-        "storages-by-type": "按类型存储",
-        "storages": "存储{plural}",
-        "strings-use": "使用的字符",
-        "tasks": "任务",
-        "total-files": "文件总数",
-        "total-users": "用户总数",
-        "total": "全部",
-        "until": "直到",
-        "updates-available-for": "有可用的更新",
-        "updates-available": "{plural} 有可用更新",
-        "used": "已使用",
-        "user": "用户",
-        "using": "使用中",
-        "version": "版本",
-        "wasted": "浪费"
+    "gluetun-status": {
+      "vpn-ip": "VPN IP",
+      "country": "国家",
+      "region": "地区",
+      "city": "城市",
+      "post-code": "邮编",
+      "location": "位置",
+      "timezone": "时区",
+      "organization": "组织"
+    },
+    "nextcloud": {
+      "active": "激活",
+      "and": "和",
+      "applications": "应用程序",
+      "available": "存在",
+      "away": "离开",
+      "cache-full": "缓存已满",
+      "chat-room": "聊天室",
+      "delete-all": "全部删除",
+      "delete-notification": "删除通知",
+      "disabled": "已禁用",
+      "disk-quota": "磁盘配额",
+      "disk-space": "磁盘空间",
+      "dnd": "请勿打扰",
+      "email": "邮箱",
+      "enabled": "已启用",
+      "federated-shares-ucfirst": "联合分享",
+      "federated-shares": "联合分享",
+      "files": "文件{plural}",
+      "free": "可用",
+      "groups": "组",
+      "hit-rate": "命中率",
+      "hits": "命中",
+      "home": "home",
+      "in": "in",
+      "keys": "keys",
+      "last-24-hours": "24 小时内",
+      "last-5-minutes": "5 分钟内",
+      "last-hour": "1 小时内",
+      "last-login": "最后登陆",
+      "last-restart": "最后重启",
+      "load-averages": "所有CPU的平均负载",
+      "local-shares": "本地分享",
+      "local": "本地",
+      "max-keys": "max keys",
+      "memory-used": "已用内存",
+      "memory-utilisation": "内存使用率",
+      "memory": "内存",
+      "misses": "misses",
+      "no-notifications": "暂无通知",
+      "no-pending-updates": "没有挂起的更新",
+      "nothing-to-show": "当前没有可展示的内容",
+      "of-which": "of which",
+      "of": "of",
+      "offline": "离线",
+      "online": "在线",
+      "other": "其他",
+      "overall": "Overall",
+      "private-link": "私有链接",
+      "public-link": "公开链接",
+      "quota-enabled": "这个用户{not}启用磁盘配额",
+      "received": "已收到",
+      "scripts": "脚本",
+      "sent": "发送",
+      "started": "已开始",
+      "storages-by-type": "按类型存储",
+      "storages": "存储{plural}",
+      "strings-use": "使用的字符",
+      "tasks": "任务",
+      "total-files": "文件总数",
+      "total-users": "用户总数",
+      "total": "全部",
+      "until": "直到",
+      "updates-available-for": "有可用的更新",
+      "updates-available": "{plural} 有可用更新",
+      "used": "已使用",
+      "user": "用户",
+      "using": "使用中",
+      "version": "版本",
+      "wasted": "浪费"
     }
   }
-}
-
+}