From 4b37a92276912993649345928a867c73adccbd4e Mon Sep 17 00:00:00 2001 From: Fu Date: Sat, 16 May 2026 05:45:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20zh-cn.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更正中文翻译。 --- res/lang/zh-cn.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/res/lang/zh-cn.json b/res/lang/zh-cn.json index 72fdce9..aa12d14 100644 --- a/res/lang/zh-cn.json +++ b/res/lang/zh-cn.json @@ -1,8 +1,8 @@ { "app_name": "Turnips", - "version": "版本号 ", + "version": "版本号: ", - "turnips": "萝卜", + "turnips": "大头菜", "visitors": "来访者", "weather": "天气", "language": "语言", @@ -23,20 +23,20 @@ "am": "上午", "pm": "下午", - "price_pattern": "买入价格: %d, 价格趋势: %s\n", - "turnips_max": "最大值: %d", - "turnips_min": "最小值: %d", - "turnips_average": "平均值: %.1f", - "week_graph": "本周图表", + "price_pattern": "买入价: %d, 价格趋势: %s\n", + "turnips_max": "最高价: %d", + "turnips_min": "最低价: %d", + "turnips_average": "均价: %.1f", + "week_graph": "本周价格趋势图", "turnips_patterns": { - "fluctuating": "上下波动", - "large_spike": "大高峰", - "decreasing": "贬值", - "small_spike": "小高峰" + "fluctuating": "波动型", + "large_spike": "大幅上涨(三期型)", + "decreasing": "递减型", + "small_spike": "小幅上涨(四期型)" }, "npcs": { - "none": "毫不", + "none": "无", "gulliver": "吕游", "label": "绵儿", "saharah": "骆岚", From f751cbc582b3110972e17e7d4075c29072af4921 Mon Sep 17 00:00:00 2001 From: Fu Date: Sat, 16 May 2026 06:37:31 +0800 Subject: [PATCH 2/5] Create main2.yml --- .github/workflows/main2.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/workflows/main2.yml diff --git a/.github/workflows/main2.yml b/.github/workflows/main2.yml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.github/workflows/main2.yml @@ -0,0 +1 @@ + From 5a5349f281a641723e84ec3f04237cd53e9c039f Mon Sep 17 00:00:00 2001 From: Fu Date: Sat, 16 May 2026 07:38:21 +0800 Subject: [PATCH 3/5] Update font ranges with new characters from translation. --- src/imgui_nx/imgui_nx.cpp | 69 ++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/src/imgui_nx/imgui_nx.cpp b/src/imgui_nx/imgui_nx.cpp index 6379ad6..7aab7fa 100644 --- a/src/imgui_nx/imgui_nx.cpp +++ b/src/imgui_nx/imgui_nx.cpp @@ -52,7 +52,7 @@ AppletHookCookie s_appletHookCookie; PadState s_pad; ImWchar const nxFontRanges[] = { - // Autogenerated, do not edit + // Manually updated with new characters from Chinese translation 0x000a, 0x000a, 0x0020, 0x0021, 0x0023, 0x0023, 0x0025, 0x0029, 0x002c, 0x0032, 0x0034, 0x0034, 0x003a, 0x003a, 0x0041, 0x0057, 0x005a, 0x005a, 0x0061, 0x007a, 0x00a0, 0x00a1, 0x00c9, 0x00c9, 0x00df, 0x00e1, 0x00e3, 0x00e4, 0x00e7, 0x00ea, 0x00ec, 0x00ec, 0x00f1, 0x00f1, 0x00f3, 0x00f3, 0x00f6, 0x00f6, 0x00fa, 0x00fa, 0x00fc, 0x00fc, 0x0105, 0x0105, 0x0107, 0x0107, 0x0119, 0x0119, @@ -62,39 +62,40 @@ ImWchar const nxFontRanges[] = { 0x30a1, 0x30a1, 0x30a3, 0x30a4, 0x30a6, 0x30a7, 0x30ab, 0x30ad, 0x30af, 0x30b0, 0x30b5, 0x30b9, 0x30bb, 0x30bb, 0x30bf, 0x30bf, 0x30c3, 0x30c3, 0x30c6, 0x30c6, 0x30c9, 0x30c9, 0x30cf, 0x30d1, 0x30d5, 0x30d7, 0x30d9, 0x30d9, 0x30e1, 0x30e1, 0x30e7, 0x30e7, 0x30e9, 0x30ec, 0x30f3, 0x30f4, 0x30fc, 0x30fc, 0x4e00, 0x4e00, 0x4e09, 0x4e0b, 0x4e0d, 0x4e0d, 0x4e2a, 0x4e2a, 0x4e2d, 0x4e2d, - 0x4e70, 0x4e70, 0x4e88, 0x4e88, 0x4e8c, 0x4e8c, 0x4e94, 0x4e94, 0x4ee5, 0x4ee5, 0x4ef7, 0x4ef7, 0x4efb, 0x4efb, 0x4f53, 0x4f53, - 0x4f55, 0x4f55, 0x4f5b, 0x4f5b, 0x4fa1, 0x4fa1, 0x4fdd, 0x4fde, 0x503c, 0x503c, 0x5085, 0x5085, 0x50f9, 0x50f9, 0x513f, 0x513f, - 0x514b, 0x514b, 0x5165, 0x5165, 0x516d, 0x516d, 0x5206, 0x5206, 0x5217, 0x5217, 0x5229, 0x5229, 0x523b, 0x523b, 0x524d, 0x524d, - 0x529b, 0x529b, 0x52a8, 0x52a8, 0x52bf, 0x52bf, 0x52d5, 0x52d5, 0x5317, 0x5317, 0x5348, 0x5348, 0x534a, 0x534a, 0x5357, 0x5357, - 0x535c, 0x535c, 0x53e4, 0x53e4, 0x53ef, 0x53ef, 0x53f7, 0x53f8, 0x5415, 0x5415, 0x5468, 0x5468, 0x548c, 0x548c, 0x54c8, 0x54c8, - 0x554f, 0x554f, 0x56db, 0x56db, 0x56fe, 0x56fe, 0x5716, 0x5716, 0x571f, 0x571f, 0x5728, 0x5728, 0x5747, 0x5747, 0x5904, 0x5904, - 0x5909, 0x5909, 0x5927, 0x5927, 0x5929, 0x5929, 0x592b, 0x592b, 0x5b50, 0x5b50, 0x5b58, 0x5b58, 0x5ba2, 0x5ba2, 0x5c0f, 0x5c0f, - 0x5c11, 0x5c11, 0x5c9a, 0x5c9a, 0x5cf0, 0x5cf0, 0x5df2, 0x5df2, 0x5e03, 0x5e03, 0x5e73, 0x5e73, 0x5e7d, 0x5e7d, 0x5ef7, 0x5ef7, - 0x5f0f, 0x5f0f, 0x5f48, 0x5f48, 0x5f8c, 0x5f8c, 0x5fb7, 0x5fb7, 0x6240, 0x6240, 0x62c9, 0x62c9, 0x6492, 0x6492, 0x654f, 0x654f, - 0x6587, 0x6587, 0x65af, 0x65af, 0x65b9, 0x65b9, 0x65e5, 0x65e5, 0x65f6, 0x65f6, 0x661f, 0x661f, 0x662f, 0x662f, 0x6642, 0x6642, - 0x66dc, 0x66dc, 0x6700, 0x6700, 0x6708, 0x6709, 0x671f, 0x671f, 0x6728, 0x6728, 0x672c, 0x672c, 0x6765, 0x6765, 0x683c, 0x683c, - 0x6863, 0x6863, 0x6885, 0x6885, 0x6a19, 0x6a19, 0x6a21, 0x6a21, 0x6b21, 0x6b21, 0x6b64, 0x6b64, 0x6beb, 0x6beb, 0x6c14, 0x6c14, - 0x6c17, 0x6c17, 0x6c23, 0x6c23, 0x6c34, 0x6c34, 0x6c92, 0x6c92, 0x6ce2, 0x6ce2, 0x6d41, 0x6d41, 0x6d4b, 0x6d4b, 0x6d77, 0x6d77, - 0x6e1b, 0x6e1b, 0x6e2c, 0x6e2c, 0x6e38, 0x6e38, 0x706b, 0x706b, 0x7136, 0x7136, 0x723e, 0x723e, 0x7248, 0x7248, 0x72d0, 0x72d0, - 0x73a9, 0x73a9, 0x73c2, 0x73c2, 0x7403, 0x7403, 0x7409, 0x7409, 0x74e6, 0x74e6, 0x7684, 0x7684, 0x76d7, 0x76d7, 0x79cd, 0x79cd, - 0x7a2e, 0x7a2e, 0x7a57, 0x7a57, 0x7ad9, 0x7ad9, 0x7b80, 0x7b80, 0x7c64, 0x7c64, 0x7cbe, 0x7cbe, 0x7d42, 0x7d42, 0x7e41, 0x7e41, - 0x7ee2, 0x7ee2, 0x7ef5, 0x7ef5, 0x7f51, 0x7f51, 0x7fa4, 0x7fa4, 0x8005, 0x8005, 0x840a, 0x840a, 0x841d, 0x841d, 0x8514, 0x8514, - 0x851a, 0x851a, 0x859b, 0x859b, 0x863f, 0x863f, 0x8868, 0x8868, 0x8a00, 0x8a00, 0x8a2a, 0x8a2a, 0x8a9e, 0x8a9e, 0x8af8, 0x8af8, - 0x8bbf, 0x8bbf, 0x8bed, 0x8bed, 0x8cb7, 0x8cb7, 0x8cfc, 0x8cfc, 0x8d2c, 0x8d2c, 0x8d8b, 0x8d8b, 0x8e22, 0x8e22, 0x8f15, 0x8f15, - 0x8f38, 0x8f38, 0x8f93, 0x8f93, 0x8fc7, 0x8fc7, 0x8fd9, 0x8fd9, 0x9031, 0x9031, 0x904e, 0x904e, 0x905e, 0x905e, 0x91d1, 0x91d1, - 0x9593, 0x9593, 0x95f4, 0x95f4, 0x96e8, 0x96e8, 0x96f7, 0x96f7, 0x9748, 0x9748, 0x9769, 0x9769, 0x9810, 0x9810, 0x9884, 0x9884, - 0x9a86, 0x9a86, 0x9ad4, 0x9ad4, 0x9ad8, 0x9ad8, 0x9f99, 0x9f99, 0xac00, 0xac00, 0xac04, 0xac04, 0xac10, 0xac10, 0xac1d, 0xac1d, - 0xaca9, 0xaca9, 0xace0, 0xace0, 0xad6c, 0xad6d, 0xade0, 0xade0, 0xae08, 0xae08, 0xae68, 0xae68, 0xb0a0, 0xb0a0, 0xb0a8, 0xb0a8, - 0xb298, 0xb298, 0xb2c8, 0xb2c8, 0xb300, 0xb300, 0xb3d9, 0xb3d9, 0xb41c, 0xb41c, 0xb77c, 0xb77c, 0xb798, 0xb798, 0xb808, 0xb808, - 0xb825, 0xb825, 0xb97c, 0xb97c, 0xb9ad, 0xb9ad, 0xb9c8, 0xb9c9, 0xb9e4, 0xb9e4, 0xbaa9, 0xbaa9, 0xbb34, 0xbb34, 0xbb38, 0xbb38, - 0xbc0f, 0xbc0f, 0xbc18, 0xbc18, 0xbc29, 0xbc29, 0xbc84, 0xbc84, 0xbcc0, 0xbcc0, 0xbd09, 0xbd09, 0xbd80, 0xbd81, 0xbe48, 0xbe48, - 0xc0ac, 0xc0ac, 0xc11c, 0xc11c, 0xc131, 0xc131, 0xc138, 0xc138, 0xc18c, 0xc18c, 0xc218, 0xc219, 0xc21c, 0xc21c, 0xc2a4, 0xc2a4, - 0xc2dc, 0xc2dc, 0xc528, 0xc528, 0xc557, 0xc557, 0xc5b4, 0xc5b4, 0xc5b8, 0xc5b8, 0xc5c6, 0xc5c6, 0xc5d0, 0xc5d0, 0xc5ec, 0xc5ec, - 0xc624, 0xc625, 0xc628, 0xc628, 0xc694, 0xc694, 0xc6b0, 0xc6b1, 0xc6d4, 0xc6d4, 0xc720, 0xc720, 0xc740, 0xc740, 0xc744, 0xc744, - 0xc74c, 0xc74c, 0xc758, 0xc758, 0xc774, 0xc774, 0xc778, 0xc778, 0xc77c, 0xc77c, 0xc785, 0xc785, 0xc791, 0xc791, 0xc7a5, 0xc7a5, - 0xc800, 0xc801, 0xc804, 0xc804, 0xc8e0, 0xc8e0, 0xc8fc, 0xc8fc, 0xc9c0, 0xc9c0, 0xcc28, 0xcc28, 0xcd5c, 0xcd5c, 0xd070, 0xd070, - 0xd1a0, 0xd1a0, 0xd2b8, 0xd2b8, 0xd2f4, 0xd2f4, 0xd301, 0xd301, 0xd30c, 0xd30c, 0xd328, 0xd328, 0xd3c9, 0xd3c9, 0xd558, 0xd558, - 0xd55c, 0xd55c, 0xd574, 0xd574, 0xd654, 0xd655, 0xd6c4, 0xd6c4, 0xff01, 0xff01, 0xff0c, 0xff0c, 0xff1a, 0xff1a, + 0x4e70, 0x4e70, 0x4e88, 0x4e88, 0x4e8c, 0x4e8c, 0x4e94, 0x4e94, 0x4ee5, 0x4ee5, 0x4ef7, 0x4ef7, 0x4efb, 0x4efb, 0x4f4e, 0x4f4e, + 0x4f53, 0x4f53, 0x4f55, 0x4f55, 0x4f5b, 0x4f5b, 0x4fa1, 0x4fa1, 0x4fdd, 0x4fde, 0x503c, 0x503c, 0x5085, 0x5085, 0x50f9, 0x50f9, + 0x513f, 0x513f, 0x514b, 0x514b, 0x5165, 0x5165, 0x516d, 0x516d, 0x51cf, 0x51cf, 0x5206, 0x5206, 0x5217, 0x5217, 0x5229, 0x5229, + 0x523b, 0x523b, 0x524d, 0x524d, 0x529b, 0x529b, 0x52a8, 0x52a8, 0x52bf, 0x52bf, 0x52d5, 0x52d5, 0x5317, 0x5317, 0x5348, 0x5348, + 0x534a, 0x534a, 0x5357, 0x5357, 0x535c, 0x535c, 0x53e4, 0x53e4, 0x53ef, 0x53ef, 0x53f7, 0x53f8, 0x5415, 0x5415, 0x5468, 0x5468, + 0x548c, 0x548c, 0x54c8, 0x54c8, 0x554f, 0x554f, 0x56db, 0x56db, 0x56fe, 0x56fe, 0x5716, 0x5716, 0x571f, 0x571f, 0x5728, 0x5728, + 0x5747, 0x5747, 0x578b, 0x578b, 0x5904, 0x5904, 0x5909, 0x5909, 0x5927, 0x5927, 0x5929, 0x5929, 0x592b, 0x592b, 0x5934, 0x5934, + 0x5b50, 0x5b50, 0x5b58, 0x5b58, 0x5ba2, 0x5ba2, 0x5c0f, 0x5c0f, 0x5c11, 0x5c11, 0x5c9a, 0x5c9a, 0x5cf0, 0x5cf0, 0x5df2, 0x5df2, + 0x5e03, 0x5e03, 0x5e45, 0x5e45, 0x5e73, 0x5e73, 0x5e7d, 0x5e7d, 0x5ef7, 0x5ef7, 0x5f0f, 0x5f0f, 0x5f48, 0x5f48, 0x5f8c, 0x5f8c, + 0x5fb7, 0x5fb7, 0x6240, 0x6240, 0x62c9, 0x62c9, 0x6492, 0x6492, 0x654f, 0x654f, 0x6587, 0x6587, 0x65af, 0x65af, 0x65b9, 0x65b9, + 0x65e0, 0x65e0, 0x65e5, 0x65e5, 0x65f6, 0x65f6, 0x661f, 0x661f, 0x662f, 0x662f, 0x6642, 0x6642, 0x66dc, 0x66dc, 0x6700, 0x6700, + 0x6708, 0x6709, 0x671f, 0x671f, 0x6728, 0x6728, 0x672c, 0x672c, 0x6765, 0x6765, 0x683c, 0x683c, 0x6863, 0x6863, 0x6885, 0x6885, + 0x6a19, 0x6a19, 0x6a21, 0x6a21, 0x6b21, 0x6b21, 0x6b64, 0x6b64, 0x6beb, 0x6beb, 0x6c14, 0x6c14, 0x6c17, 0x6c17, 0x6c23, 0x6c23, + 0x6c34, 0x6c34, 0x6c92, 0x6c92, 0x6ce2, 0x6ce2, 0x6d41, 0x6d41, 0x6d4b, 0x6d4b, 0x6d77, 0x6d77, 0x6da8, 0x6da8, 0x6e1b, 0x6e1b, + 0x6e2c, 0x6e2c, 0x6e38, 0x6e38, 0x706b, 0x706b, 0x7136, 0x7136, 0x723e, 0x723e, 0x7248, 0x7248, 0x72d0, 0x72d0, 0x73a9, 0x73a9, + 0x73c2, 0x73c2, 0x7403, 0x7403, 0x7409, 0x7409, 0x74e6, 0x74e6, 0x7684, 0x7684, 0x76d7, 0x76d7, 0x79cd, 0x79cd, 0x7a2e, 0x7a2e, + 0x7a57, 0x7a57, 0x7ad9, 0x7ad9, 0x7b80, 0x7b80, 0x7c64, 0x7c64, 0x7cbe, 0x7cbe, 0x7d42, 0x7d42, 0x7e41, 0x7e41, 0x7ee2, 0x7ee2, + 0x7ef5, 0x7ef5, 0x7f51, 0x7f51, 0x7fa4, 0x7fa4, 0x8005, 0x8005, 0x83dc, 0x83dc, 0x840a, 0x840a, 0x851a, 0x851a, 0x859b, 0x859b, + 0x863f, 0x863f, 0x8868, 0x8868, 0x8a00, 0x8a00, 0x8a2a, 0x8a2a, 0x8a9e, 0x8a9e, 0x8af8, 0x8af8, 0x8bbf, 0x8bbf, 0x8bed, 0x8bed, + 0x8cb7, 0x8cb7, 0x8cfc, 0x8cfc, 0x8d2c, 0x8d2c, 0x8d8b, 0x8d8b, 0x8e22, 0x8e22, 0x8f15, 0x8f15, 0x8f38, 0x8f38, 0x8f93, 0x8f93, + 0x8fc7, 0x8fc7, 0x8fd9, 0x8fd9, 0x9012, 0x9012, 0x9031, 0x9031, 0x904e, 0x904e, 0x905e, 0x905e, 0x91d1, 0x91d1, 0x9593, 0x9593, + 0x95f4, 0x95f4, 0x96e8, 0x96e8, 0x96f7, 0x96f7, 0x9748, 0x9748, 0x9769, 0x9769, 0x9810, 0x9810, 0x9884, 0x9884, 0x9a86, 0x9a86, + 0x9ad4, 0x9ad4, 0x9ad8, 0x9ad8, 0x9f99, 0x9f99, 0xac00, 0xac00, 0xac04, 0xac04, 0xac10, 0xac10, 0xac1d, 0xac1d, 0xaca9, 0xaca9, + 0xace0, 0xace0, 0xad6c, 0xad6d, 0xade0, 0xade0, 0xae08, 0xae08, 0xae68, 0xae68, 0xb0a0, 0xb0a0, 0xb0a8, 0xb0a8, 0xb298, 0xb298, + 0xb2c8, 0xb2c8, 0xb300, 0xb300, 0xb3d9, 0xb3d9, 0xb41c, 0xb41c, 0xb77c, 0xb77c, 0xb798, 0xb798, 0xb808, 0xb808, 0xb825, 0xb825, + 0xb97c, 0xb97c, 0xb9ad, 0xb9ad, 0xb9c8, 0xb9c9, 0xb9e4, 0xb9e4, 0xbaa9, 0xbaa9, 0xbb34, 0xbb34, 0xbb38, 0xbb38, 0xbc0f, 0xbc0f, + 0xbc18, 0xbc18, 0xbc29, 0xbc29, 0xbc84, 0xbc84, 0xbcc0, 0xbcc0, 0xbd09, 0xbd09, 0xbd80, 0xbd81, 0xbe48, 0xbe48, 0xc0ac, 0xc0ac, + 0xc11c, 0xc11c, 0xc131, 0xc131, 0xc138, 0xc138, 0xc18c, 0xc18c, 0xc218, 0xc219, 0xc21c, 0xc21c, 0xc2a4, 0xc2a4, 0xc2dc, 0xc2dc, + 0xc528, 0xc528, 0xc557, 0xc557, 0xc5b4, 0xc5b4, 0xc5b8, 0xc5b8, 0xc5c6, 0xc5c6, 0xc5d0, 0xc5d0, 0xc5ec, 0xc5ec, 0xc624, 0xc625, + 0xc628, 0xc628, 0xc694, 0xc694, 0xc6b0, 0xc6b1, 0xc6d4, 0xc6d4, 0xc720, 0xc720, 0xc740, 0xc740, 0xc744, 0xc744, 0xc74c, 0xc74c, + 0xc758, 0xc758, 0xc774, 0xc774, 0xc778, 0xc778, 0xc77c, 0xc77c, 0xc785, 0xc785, 0xc791, 0xc791, 0xc7a5, 0xc7a5, 0xc800, 0xc801, + 0xc804, 0xc804, 0xc8e0, 0xc8e0, 0xc8fc, 0xc8fc, 0xc9c0, 0xc9c0, 0xcc28, 0xcc28, 0xcd5c, 0xcd5c, 0xd070, 0xd070, 0xd1a0, 0xd1a0, + 0xd2b8, 0xd2b8, 0xd2f4, 0xd2f4, 0xd301, 0xd301, 0xd30c, 0xd30c, 0xd328, 0xd328, 0xd3c9, 0xd3c9, 0xd558, 0xd558, 0xd55c, 0xd55c, + 0xd574, 0xd574, 0xd654, 0xd655, 0xd6c4, 0xd6c4, 0xff01, 0xff01, 0xff0c, 0xff0c, 0xff1a, 0xff1a, }; void handleAppletHook(AppletHookType type, void *param) { From f03b8b69202be853d51ba94e2dbbcf4fdd229d32 Mon Sep 17 00:00:00 2001 From: Fu Date: Sat, 16 May 2026 07:40:02 +0800 Subject: [PATCH 4/5] Update translation for 'turnips' in zh-tw.json --- res/lang/zh-tw.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/lang/zh-tw.json b/res/lang/zh-tw.json index 8b2f3c5..8d7d602 100644 --- a/res/lang/zh-tw.json +++ b/res/lang/zh-tw.json @@ -2,7 +2,7 @@ "app_name": "Turnips", "version": "版本", - "turnips": "蘿蔔", + "turnips": "大头菜", "visitors": "訪客", "weather": "天氣", "language": "語", From d4904f1c302240f139a32902870ae7b148aa1966 Mon Sep 17 00:00:00 2001 From: Fu Date: Sat, 16 May 2026 08:28:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=20main2.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main2.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/workflows/main2.yml diff --git a/.github/workflows/main2.yml b/.github/workflows/main2.yml deleted file mode 100644 index 8b13789..0000000 --- a/.github/workflows/main2.yml +++ /dev/null @@ -1 +0,0 @@ -