From dfe5ccec6f0c32bccaecf4c23bc163ebd447189e Mon Sep 17 00:00:00 2001 From: Rintim Date: Thu, 20 Aug 2020 15:33:11 +0800 Subject: [PATCH] 2020/08/20: Niean - Releases --- source/core/task/dataop.c | 4 ++-- source/fbi/action/pastecontents.c | 18 +++++++++--------- source/fbi/files.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/core/task/dataop.c b/source/core/task/dataop.c index be56086..fc04e0e 100644 --- a/source/core/task/dataop.c +++ b/source/core/task/dataop.c @@ -267,7 +267,7 @@ static void task_data_op_thread(void* arg) { if(R_FAILED(res)) { if(res == R_APP_CANCELLED) { - prompt_display_notify("Failure", "Operation cancelled.", COLOR_TEXT, NULL, NULL, NULL); + prompt_display_notify("失敗", "操作被取消", COLOR_TEXT, NULL, NULL, NULL); break; } else if(res != R_APP_SKIPPED) { ui_view* errorView = NULL; @@ -277,7 +277,7 @@ static void task_data_op_thread(void* arg) { svcWaitSynchronization(errorView->active, U64_MAX); } - ui_view* retryView = prompt_display_yes_no("Confirmation", "Retry?", COLOR_TEXT, data, NULL, task_data_op_retry_onresponse); + ui_view* retryView = prompt_display_yes_no("確認", "即將重試，是否繼續？", COLOR_TEXT, data, NULL, task_data_op_retry_onresponse); if(retryView != NULL) { svcWaitSynchronization(retryView->active, U64_MAX); diff --git a/source/fbi/action/pastecontents.c b/source/fbi/action/pastecontents.c index 6751f40..5fe5b84 100644 --- a/source/fbi/action/pastecontents.c +++ b/source/fbi/action/pastecontents.c @@ -240,7 +240,7 @@ static void action_paste_contents_update(ui_view* view, void* data, float* progr info_destroy(view); if(R_SUCCEEDED(pasteData->pasteInfo.result)) { - prompt_display_notify("成功", "檔案以粘貼", COLOR_TEXT, NULL, NULL, NULL); + prompt_display_notify("成功", "档案以粘貼", COLOR_TEXT, NULL, NULL, NULL); } action_paste_contents_free_data(pasteData); @@ -268,7 +268,7 @@ static void action_paste_contents_onresponse(ui_view* view, void* data, u32 resp if(response == PROMPT_YES) { Result res = task_data_op(&pasteData->pasteInfo); if(R_SUCCEEDED(res)) { - info_display("正在粘貼檔案中", "按B鍵取消", true, data, action_paste_contents_update, action_paste_contents_draw_top); + info_display("正在粘貼档案中", "按B鍵取消", true, data, action_paste_contents_update, action_paste_contents_draw_top); } else { error_display_res(NULL, NULL, res, "無法初始化粘貼操作"); @@ -300,9 +300,9 @@ static void action_paste_contents_loading_update(ui_view* view, void* data, floa loadingData->pasteData->pasteInfo.total = linked_list_size(&loadingData->pasteData->contents); loadingData->pasteData->pasteInfo.processed = loadingData->pasteData->pasteInfo.total; - prompt_display_yes_no("確認", "即將粘貼剪貼板檔案到當前資料夾下，是否繼續？", COLOR_TEXT, loadingData->pasteData, action_paste_contents_draw_top, action_paste_contents_onresponse); + prompt_display_yes_no("確認", "即將粘貼剪貼板档案到當前資料夾下，是否繼續？", COLOR_TEXT, loadingData->pasteData, action_paste_contents_draw_top, action_paste_contents_onresponse); } else { - error_display_res(NULL, NULL, loadingData->popData.result, "無法列舉剪貼板檔案目錄"); + error_display_res(NULL, NULL, loadingData->popData.result, "無法列舉剪貼板档案目錄"); action_paste_contents_free_data(loadingData->pasteData); } @@ -315,18 +315,18 @@ static void action_paste_contents_loading_update(ui_view* view, void* data, floa svcSignalEvent(loadingData->popData.cancelEvent); } - snprintf(text, PROGRESS_TEXT_MAX, "獲取剪貼板檔案目錄中......"); + snprintf(text, PROGRESS_TEXT_MAX, "獲取剪貼板档案目錄中......"); } void action_paste_contents(linked_list* items, list_item* selected) { if(!clipboard_has_contents()) { - prompt_display_notify("失敗", "剪貼板無檔案.", COLOR_TEXT, NULL, NULL, NULL); + prompt_display_notify("失敗", "剪貼板無档案.", COLOR_TEXT, NULL, NULL, NULL); return; } paste_contents_data* data = (paste_contents_data*) calloc(1, sizeof(paste_contents_data)); if(data == NULL) { - error_display(NULL, NULL, "無法分配粘貼檔案數據"); + error_display(NULL, NULL, "無法分配粘貼档案數據"); return; } @@ -336,7 +336,7 @@ void action_paste_contents(linked_list* items, list_item* selected) { file_info* targetInfo = (file_info*) selected->data; Result targetCreateRes = task_create_file_item(&data->targetItem, targetInfo->archive, targetInfo->path, targetInfo->attributes, false); if(R_FAILED(targetCreateRes)) { - error_display_res(NULL, NULL, targetCreateRes, "無法創建目標檔案"); + error_display_res(NULL, NULL, targetCreateRes, "無法創建目標档案"); action_paste_contents_free_data(data); return; @@ -393,7 +393,7 @@ void action_paste_contents(linked_list* items, list_item* selected) { Result listRes = task_populate_files(&loadingData->popData); if(R_FAILED(listRes)) { - error_display_res(NULL, NULL, listRes, "Failed to initiate clipboard content list population.無法初始化剪貼板檔案目錄結構"); + error_display_res(NULL, NULL, listRes, "無法初始化剪貼板档案目錄結構"); free(loadingData); action_paste_contents_free_data(data); diff --git a/source/fbi/files.c b/source/fbi/files.c index e053121..e5b1f50 100644 --- a/source/fbi/files.c +++ b/source/fbi/files.c @@ -270,7 +270,7 @@ static void files_repopulate(files_data* listData, linked_list* items) { Result res = task_populate_files(&listData->populateData); if(R_FAILED(res)) { - error_display_res(NULL, NULL, res, "無法初始化档案列表"); + error_display_res(NULL, NULL, res, "無法初始化档案目錄結構"); } listData->populated = true; @@ -360,7 +360,7 @@ static void files_update(ui_view* view, void* data, linked_list* items, list_ite } if(listData->populateData.finished && R_FAILED(listData->populateData.result)) { - error_display_res(NULL, NULL, listData->populateData.result, "無法填充档案列表"); + error_display_res(NULL, NULL, listData->populateData.result, "無法列舉档案目錄"); listData->populateData.result = 0; }