Merge branch 'master' into tc2

easyworld · May 11, 2024 · 9d402a3 · 9d402a3
2 parents a10e485 + 460bbd2
commit 9d402a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nyx/nyx_gui/frontend/gui.c b/nyx/nyx_gui/frontend/gui.c
@@ -2055,7 +2055,7 @@ static void _create_tab_home(lv_theme_t *th, lv_obj_t *parent)
 	_create_text_button(th, NULL, btn_reboot, SYMBOL_REBOOT" 重啟", _create_mbox_reboot);
 	lv_obj_align(btn_reboot, btn_power_off, LV_ALIGN_OUT_LEFT_MID, 0, 0);
 
-	_create_text_button(th, NULL, btn_reload, SYMBOL_REFRESH" 過載", _create_mbox_reload);
+	_create_text_button(th, NULL, btn_reload, SYMBOL_REFRESH" 重新載入", _create_mbox_reload);
 	lv_obj_align(btn_reload, btn_reboot, LV_ALIGN_OUT_LEFT_MID, 0, 0);
 }
 

diff --git a/nyx/nyx_gui/frontend/gui_tools_partition_manager.c b/nyx/nyx_gui/frontend/gui_tools_partition_manager.c
@@ -2629,7 +2629,7 @@ lv_res_t create_window_partition_manager(lv_obj_t *btn)
 	// Create slider type labels.
 	lv_obj_t *lbl_hos = lv_label_create(h1, NULL);
 	lv_label_set_recolor(lbl_hos, true);
-	lv_label_set_static_text(lbl_hos, "#96FF00 "SYMBOL_DOT" 官方系統 (FAT32) :#");
+	lv_label_set_static_text(lbl_hos, "#96FF00 "SYMBOL_DOT" 官方系統(FAT32):#");
 	lv_obj_align(lbl_hos, bar_hos, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 2);
 
 	lv_obj_t *lbl_emu = lv_label_create(h1, lbl_hos);