From fca5adbbd3c9f68326686848f1f683c13ed5a3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E6=9C=88?= <3600911665@qq.com> Date: Thu, 17 Jul 2025 21:49:14 +0800 Subject: [PATCH 1/3] Recover the import "root:/services/" in the wrongly deleted setting.qml --- .config/quickshell/ii/settings.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/quickshell/ii/settings.qml b/.config/quickshell/ii/settings.qml index ed511a04a..71ada3ec9 100644 --- a/.config/quickshell/ii/settings.qml +++ b/.config/quickshell/ii/settings.qml @@ -14,6 +14,7 @@ import Quickshell import Quickshell.Io import Quickshell.Hyprland import "root:/" +import "root:/services/" import "root:/modules/common/" import "root:/modules/common/widgets/" import "root:/modules/common/functions/color_utils.js" as ColorUtils From 7f3fb26651169dbe6db693cbeb3fdc50d9f07a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E6=9C=88?= <3600911665@qq.com> Date: Thu, 17 Jul 2025 22:01:41 +0800 Subject: [PATCH 2/3] Translation: Update weather information card title to support multiple languages, and clean up unnecessary translation entries --- .../ii/modules/bar/weather/WeatherPopup.qml | 17 +++---- .config/quickshell/translations/en_US.json | 46 ++++--------------- .config/quickshell/translations/zh_CN.json | 44 ++++-------------- 3 files changed, 26 insertions(+), 81 deletions(-) diff --git a/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml b/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml index b39fffd37..57c668275 100644 --- a/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml +++ b/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml @@ -1,3 +1,4 @@ +import "root:/" import "root:/services" import "root:/modules/common" import "root:/modules/common/widgets" @@ -52,42 +53,42 @@ Rectangle { uniformCellWidths: true WeatherCard { - title: "UV Index" + title: Translation.tr("UV Index") symbol: "wb_sunny" value: Weather.data.uv } WeatherCard { - title: "Wind" + title: Translation.tr("Wind") symbol: "air" value: `(${Weather.data.windDir}) ${Weather.data.wind}` } WeatherCard { - title: "Precipitation" + title: Translation.tr("Precipitation") symbol: "rainy_light" value: Weather.data.precip } WeatherCard { - title: "Humidity" + title: Translation.tr("Humidity") symbol: "humidity_low" value: Weather.data.humidity } WeatherCard { - title: "Visibility" + title: Translation.tr("Visibility") symbol: "visibility" value: Weather.data.visib } WeatherCard { - title: "Pressure" + title: Translation.tr("Pressure") symbol: "readiness_score" value: Weather.data.press } WeatherCard { - title: "Sunrise" + title: Translation.tr("Sunrise") symbol: "wb_twilight" value: Weather.data.sunrise } WeatherCard { - title: "Sunset" + title: Translation.tr("Sunset") symbol: "bedtime" value: Weather.data.sunset } diff --git a/.config/quickshell/translations/en_US.json b/.config/quickshell/translations/en_US.json index 7141cdaa5..fe8c64533 100644 --- a/.config/quickshell/translations/en_US.json +++ b/.config/quickshell/translations/en_US.json @@ -32,18 +32,10 @@ "Clear chat history": "Clear chat history", "Clear the current list of images": "Clear the current list of images", "Close": "Close", - "Closes cheatsheet on press": "Closes cheatsheet on press", - "Closes left sidebar on press": "Closes left sidebar on press", - "Closes media controls on press": "Closes media controls on press", - "Closes on screen keyboard on press": "Closes on screen keyboard on press", - "Closes overview": "Closes overview", - "Closes right sidebar on press": "Closes right sidebar on press", "Copy": "Copy", "Copy code": "Copy code", - "Decrease brightness": "Decrease brightness", "Delete": "Delete", "Desktop": "Desktop", - "Detach left sidebar into a window/Attach it back": "Detach left sidebar into a window/Attach it back", "Disable NSFW content": "Disable NSFW content", "Done": "Done", "Download": "Download", @@ -55,10 +47,6 @@ "Game mode": "Game mode", "Get the next page of results": "Get the next page of results", "Hibernate": "Hibernate", - "Hides brightness OSD on press": "Hides brightness OSD on press", - "Hides volume OSD on press": "Hides volume OSD on press", - "Hold to show workspace numbers, release to show icons": "Hold to show workspace numbers, release to show icons", - "Increase brightness": "Increase brightness", "Input": "Input", "Intelligence": "Intelligence", "Interface": "Interface", @@ -81,12 +69,6 @@ "Notifications": "Notifications", "OK": "OK", "Open file link": "Open file link", - "Opens cheatsheet on press": "Opens cheatsheet on press", - "Opens left sidebar on press": "Opens left sidebar on press", - "Opens media controls on press": "Opens media controls on press", - "Opens on screen keyboard on press": "Opens on screen keyboard on press", - "Opens right sidebar on press": "Opens right sidebar on press", - "Opens session screen on press": "Opens session screen on press", "Output": "Output", "Reboot": "Reboot", "Reboot to firmware settings": "Reboot to firmware settings", @@ -113,21 +95,8 @@ "The hentai one | Great quantity, a lot of NSFW, quality varies wildly": "The hentai one | Great quantity, a lot of NSFW, quality varies wildly", "The popular one | Best quantity, but quality can vary wildly": "The popular one | Best quantity, but quality can vary wildly", "Thinking": "Thinking", - "To make sure this works consistently, use binditn = MODKEYS, catchall in an automatically triggered submap that includes everything.": "To make sure this works consistently, use binditn = MODKEYS, catchall in an automatically triggered submap that includes everything.", - "Toggle clipboard query on overview widget": "Toggle clipboard query on overview widget", - "Toggle emoji query on overview widget": "Toggle emoji query on overview widget", - "Toggles cheatsheet on press": "Toggles cheatsheet on press", - "Toggles left sidebar on press": "Toggles left sidebar on press", - "Toggles media controls on press": "Toggles media controls on press", - "Toggles on screen keyboard on press": "Toggles on screen keyboard on press", - "Toggles overview on press": "Toggles overview on press", - "Toggles overview on release": "Toggles overview on release", - "Toggles right sidebar on press": "Toggles right sidebar on press", - "Toggles session screen on press": "Toggles session screen on press", "Translation goes here...": "Translation goes here...", "Translator": "Translator", - "Triggers brightness OSD on press": "Triggers brightness OSD on press", - "Triggers volume OSD on press": "Triggers volume OSD on press", "Unfinished": "Unfinished", "Unknown": "Unknown", "Unknown Album": "Unknown Album", @@ -143,11 +112,9 @@ "Invalid API provider. Supported: \n-": "Invalid API provider. Supported: \n-", "Unknown command:": "Unknown command:", "Type /key to get started with online models\nCtrl+O to expand the sidebar\nCtrl+P to detach sidebar into a window": "Type /key to get started with online models\nCtrl+O to expand the sidebar\nCtrl+P to detach sidebar into a window", - "This is necessary because GlobalShortcut.onReleased in quickshell triggers whether or not you press something else while holding the key.": "This is necessary because GlobalShortcut.onReleased in quickshell triggers whether or not you press something else while holding the key.", "The current API used. Endpoint:": "The current API used. Endpoint:", "Provider set to": "Provider set to", "Invalid model. Supported: \n```": "Invalid model. Supported: \n```", - "Interrupts possibility of overview being toggled on release.": "Interrupts possibility of overview being toggled on release.", "That didn't work. Tips:\n- Check your tags and NSFW settings\n- If you don't have a tag in mind, type a page number": "That didn't work. Tips:\n- Check your tags and NSFW settings\n- If you don't have a tag in mind, type a page number", "Online | Google's model\nGives up-to-date information with search.": "Online | Google's model\nGives up-to-date information with search.", "Switched to search mode. Continue with the user's request.": "Switched to search mode. Continue with the user's request.", @@ -322,21 +289,26 @@ "Select output device": "Select output device", "Code saved to file": "Code saved to file", "Online models disallowed\n\nControlled by `policies.ai` config option": "Online models disallowed\n\nControlled by `policies.ai` config option", - "Opens bar on press": "Opens bar on press", "Scroll to change volume": "Scroll to change volume", - "Toggles bar on press": "Toggles bar on press", "Elements": "Elements", "%1 • %2 tasks": "%1 • %2 tasks", "Download complete": "Download complete", "Please charge!\nAutomatic suspend triggers at %1": "Please charge!\nAutomatic suspend triggers at %1", "Cloudflare WARP": "Cloudflare WARP", "Cloudflare WARP (1.1.1.1)": "Cloudflare WARP (1.1.1.1)", - "Closes bar on press": "Closes bar on press", "Scroll to change brightness": "Scroll to change brightness", "Connection failed. Please inspect manually with the warp-cli command": "Connection failed. Please inspect manually with the warp-cli command", "Select input device": "Select input device", "Registration failed. Please inspect manually with the warp-cli command": "Registration failed. Please inspect manually with the warp-cli command", "Consider plugging in your device": "Consider plugging in your device", "Low battery": "Low battery", - "Saved to %1": "Saved to %1" + "Saved to %1": "Saved to %1", + "Sunset": "Sunset", + "UV Index": "UV Index", + "Humidity": "Humidity", + "Wind": "Wind", + "Sunrise": "Sunrise", + "Pressure": "Pressure", + "Visibility": "Visibility", + "Precipitation": "Precipitation" } \ No newline at end of file diff --git a/.config/quickshell/translations/zh_CN.json b/.config/quickshell/translations/zh_CN.json index c2c2fdf89..c81da2209 100644 --- a/.config/quickshell/translations/zh_CN.json +++ b/.config/quickshell/translations/zh_CN.json @@ -34,19 +34,11 @@ "Clear chat history": "清除聊天记录", "Clear the current list of images": "清除当前图片列表", "Close": "关闭", - "Closes cheatsheet on press": "按下时关闭快捷键表", - "Closes left sidebar on press": "按下时关闭左侧边栏", - "Closes media controls on press": "按下时关闭媒体控制", - "Closes on screen keyboard on press": "按下时关闭屏幕键盘", - "Closes overview": "关闭概览", - "Closes right sidebar on press": "按下时关闭右侧边栏", "Copy": "复制", "Copy code": "复制代码", "Current API endpoint: %1\nSet it with %2mode PROVIDER": "当前 API 端点：%1\n使用 %2mode PROVIDER 设置", - "Decrease brightness": "降低亮度", "Delete": "删除", "Desktop": "桌面", - "Detach left sidebar into a window/Attach it back": "将左侧边栏分离为窗口/重新附加", "Disable NSFW content": "禁用 NSFW 内容", "Done": "完成", "Download": "下载", @@ -59,10 +51,6 @@ "Get the next page of results": "获取下一页结果", "Go to source (%1)": "转到源 (%1)", "Hibernate": "休眠", - "Hides brightness OSD on press": "按下时隐藏亮度显示", - "Hides volume OSD on press": "按下时隐藏音量显示", - "Hold to show workspace numbers, release to show icons": "按住显示工作区编号，松开显示图标", - "Increase brightness": "提高亮度", "Input": "输入", "Intelligence": "智能体", "Interface": "界面", @@ -87,12 +75,6 @@ "Notifications": "通知", "OK": "确定", "Open file link": "打开文件链接", - "Opens cheatsheet on press": "按下时打开快捷键表", - "Opens left sidebar on press": "按下时打开左侧边栏", - "Opens media controls on press": "按下时打开媒体控制", - "Opens on screen keyboard on press": "按下时打开屏幕键盘", - "Opens right sidebar on press": "按下时打开右侧边栏", - "Opens session screen on press": "按下时打开会话屏幕", "Output": "输出", "Page %1": "第 %1 页", "Reboot": "重启", @@ -122,21 +104,8 @@ "The hentai one | Great quantity, a lot of NSFW, quality varies wildly": "成人向 | 数量巨大，大量 NSFW，质量参差不齐", "The popular one | Best quantity, but quality can vary wildly": "最受欢迎 | 数量最多，但质量参差不齐", "Thinking": "思考中", - "To make sure this works consistently, use binditn = MODKEYS, catchall in an automatically triggered submap that includes everything.": "为确保此功能正常工作，请在自动触发的子映射中使用 binditn = MODKEYS, catchall，该子映射包含所有内容。", - "Toggle clipboard query on overview widget": "在概览组件中切换剪贴板查询", - "Toggle emoji query on overview widget": "在概览组件中切换表情符号查询", - "Toggles cheatsheet on press": "按下时切换快捷键表", - "Toggles left sidebar on press": "按下时切换左侧边栏", - "Toggles media controls on press": "按下时切换媒体控制", - "Toggles on screen keyboard on press": "按下时切换屏幕键盘", - "Toggles overview on press": "按下时切换概览", - "Toggles overview on release": "松开时切换概览", - "Toggles right sidebar on press": "按下时切换右侧边栏", - "Toggles session screen on press": "按下时切换会话屏幕", "Translation goes here...": "翻译结果会显示在这里...", "Translator": "翻译器", - "Triggers brightness OSD on press": "按下时触发亮度显示", - "Triggers volume OSD on press": "按下时触发音量显示", "Unfinished": "未完成", "Unknown": "未知", "Unknown Album": "未知专辑", @@ -158,11 +127,9 @@ "Invalid API provider. Supported: \n-": "无效的 API 提供商。支持的：\n-", "Unknown command:": "未知命令：", "Type /key to get started with online models\nCtrl+O to expand the sidebar\nCtrl+P to detach sidebar into a window": "输入 /key 开始使用在线模型\nCtrl+O 展开侧边栏\nCtrl+P 将侧边栏分离为窗口", - "This is necessary because GlobalShortcut.onReleased in quickshell triggers whether or not you press something else while holding the key.": "这是必要的，因为在按住键时，quickshell 中的 GlobalShortcut.onReleased 会在您是否按下其他键时触发。", "The current API used. Endpoint:": "当前使用的 API。端点：", "Provider set to": "提供商设置为", "Invalid model. Supported: \n```": "无效模型。支持的：\n```", - "Interrupts possibility of overview being toggled on release.": "中断松开时切换概览的可能性。", "Switched to search mode. Continue with the user's request.": "已切换到搜索模式。继续处理用户请求。", "Experimental | Online | Google's model\nCan do a little more but doesn't search quickly": "实验性 | 在线 | Google 模型\n功能更多但搜索速度较慢", "To set an API key, pass it with the command\n\nTo view the key, pass \"get\" with the command
\n\n### For %1:\n\n**Link**: %2\n\n%3": "要设置 API 密钥，请将其与命令一起传递\n\n要查看密钥，请将 \"get\" 与命令一起传递
\n\n### 对于 %1：\n\n**链接**：%2\n\n%3", @@ -321,7 +288,6 @@ "Online models disallowed\n\nControlled by `policies.ai` config option": "禁止在线模型\n\n由 `policies.ai` 配置项控制", "Select input device": "选择输入设备", "Low battery": "电量低", - "Opens bar on press": "按下时打开条栏", "Registration failed. Please inspect manually with the warp-cli command": "注册失败。请使用 warp-cli 命令手动检查", "Code saved to file": "代码已保存到文件", "Consider plugging in your device": "请考虑连接您的设备", @@ -329,7 +295,6 @@ "Please charge!\nAutomatic suspend triggers at %1": "请充电！\n自动挂起将在 %1 时触发", "Cloudflare WARP (1.1.1.1)": "Cloudflare WARP (1.1.1.1)", "Cloudflare WARP": "Cloudflare WARP", - "Closes bar on press": "按下时关闭条栏", "Download complete": "下载完成", "Critically low battery": "电量极低", "Scroll to change brightness": "滚动以调节亮度", @@ -338,5 +303,12 @@ "Elements": "元素", "Scroll to change volume": "滚动以调节音量", "Connection failed. Please inspect manually with the warp-cli command": "连接失败。请使用 warp-cli 命令手动检查", - "Toggles bar on press": "按下时切换条栏" + "UV Index": "UV Index", + "Pressure": "Pressure", + "Visibility": "Visibility", + "Sunrise": "Sunrise", + "Sunset": "Sunset", + "Humidity": "Humidity", + "Wind": "Wind", + "Precipitation": "Precipitation" } \ No newline at end of file From c64e079da4291a922fca529af4db67035fda4e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E6=9C=88?= <3600911665@qq.com> Date: Thu, 17 Jul 2025 22:10:37 +0800 Subject: [PATCH 3/3] translations: update translations/zh_CN.json --- .config/quickshell/translations/zh_CN.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/quickshell/translations/zh_CN.json b/.config/quickshell/translations/zh_CN.json index c81da2209..d59958a4a 100644 --- a/.config/quickshell/translations/zh_CN.json +++ b/.config/quickshell/translations/zh_CN.json @@ -303,12 +303,12 @@ "Elements": "元素", "Scroll to change volume": "滚动以调节音量", "Connection failed. Please inspect manually with the warp-cli command": "连接失败。请使用 warp-cli 命令手动检查", - "UV Index": "UV Index", - "Pressure": "Pressure", - "Visibility": "Visibility", - "Sunrise": "Sunrise", - "Sunset": "Sunset", - "Humidity": "Humidity", - "Wind": "Wind", - "Precipitation": "Precipitation" + "UV Index": "紫外线指数", + "Pressure": "气压", + "Visibility": "能见度", + "Sunrise": "日出", + "Sunset": "日落", + "Humidity": "湿度", + "Wind": "风", + "Precipitation": "降水量" } \ No newline at end of file