From a40a8a21e60da73dbe1a27f21863318df2d8084b Mon Sep 17 00:00:00 2001 From: Rintim Date: Tue, 18 Aug 2020 19:31:52 +0800 Subject: [PATCH] 2020/08/18: Inchar - a little change --- source/fbi/action/deletecontents.c | 38 ++++++++++++++-------------- source/fbi/action/installcias.c | 40 ++++++++++++++++-------------- source/fbi/action/rename.c | 12 +++++---- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/source/fbi/action/deletecontents.c b/source/fbi/action/deletecontents.c index 3ab7653..45b196b 100644 --- a/source/fbi/action/deletecontents.c +++ b/source/fbi/action/deletecontents.c @@ -78,7 +78,7 @@ static Result action_delete_restore(void* data, u32 index) { } static bool action_delete_error(void* data, u32 index, Result res, ui_view** errorView) { - *errorView = error_display_res(data, action_delete_draw_top, res, "Failed to delete content."); + *errorView = error_display_res(data, action_delete_draw_top, res, "無法刪除档案"); return true; } @@ -105,7 +105,7 @@ static void action_delete_update(ui_view* view, void* data, float* progress, cha info_destroy(view); if(R_SUCCEEDED(deleteData->deleteInfo.result)) { - prompt_display_notify("Success", "Deleted.", COLOR_TEXT, NULL, NULL, NULL); + prompt_display_notify("成功", "已刪除", COLOR_TEXT, NULL, NULL, NULL); } action_delete_free_data(deleteData); @@ -127,9 +127,9 @@ static void action_delete_onresponse(ui_view* view, void* data, u32 response) { if(response == PROMPT_YES) { Result res = task_data_op(&deleteData->deleteInfo); if(R_SUCCEEDED(res)) { - info_display("Deleting", "Press B to cancel.", true, data, action_delete_update, action_delete_draw_top); + info_display("刪除中", "按B鍵取消", true, data, action_delete_update, action_delete_draw_top); } else { - error_display_res(NULL, NULL, res, "Failed to initiate delete operation."); + error_display_res(NULL, NULL, res, "無法初始化刪除操作"); action_delete_free_data(deleteData); } @@ -161,9 +161,9 @@ static void action_delete_loading_update(ui_view* view, void* data, float* progr loadingData->deleteData->deleteInfo.total = linked_list_size(&loadingData->deleteData->contents); loadingData->deleteData->deleteInfo.processed = loadingData->deleteData->deleteInfo.total; - prompt_display_yes_no("Confirmation", loadingData->message, COLOR_TEXT, loadingData->deleteData, action_delete_draw_top, action_delete_onresponse); + prompt_display_yes_no("確認", loadingData->message, COLOR_TEXT, loadingData->deleteData, action_delete_draw_top, action_delete_onresponse); } else { - error_display_res(NULL, NULL, loadingData->popData.result, "Failed to populate content list."); + error_display_res(NULL, NULL, loadingData->popData.result, "無法填充档案列表"); action_delete_free_data(loadingData->deleteData); } @@ -176,13 +176,13 @@ static void action_delete_loading_update(ui_view* view, void* data, float* progr svcSignalEvent(loadingData->popData.cancelEvent); } - snprintf(text, PROGRESS_TEXT_MAX, "Fetching content list..."); + snprintf(text, PROGRESS_TEXT_MAX, "獲取档案列表..."); } static void action_delete_internal(linked_list* items, list_item* selected, const char* message, bool recursive, bool includeBase, bool ciasOnly, bool ticketsOnly) { delete_data* data = (delete_data*) calloc(1, sizeof(delete_data)); if(data == NULL) { - error_display(NULL, NULL, "Failed to allocate delete data."); + error_display(NULL, NULL, "無法分配刪除數據"); return; } @@ -192,7 +192,7 @@ static void action_delete_internal(linked_list* items, list_item* selected, cons 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, "Failed to create target file item."); + error_display_res(NULL, NULL, targetCreateRes, "無法創建目標档案"); action_delete_free_data(data); return; @@ -217,7 +217,7 @@ static void action_delete_internal(linked_list* items, list_item* selected, cons delete_loading_data* loadingData = (delete_loading_data*) calloc(1, sizeof(delete_loading_data)); if(loadingData == NULL) { - error_display(NULL, NULL, "Failed to allocate loading data."); + error_display(NULL, NULL, "無法分配讀取數據"); action_delete_free_data(data); return; @@ -237,32 +237,34 @@ static void action_delete_internal(linked_list* items, list_item* selected, cons Result listRes = task_populate_files(&loadingData->popData); if(R_FAILED(listRes)) { - error_display_res(NULL, NULL, listRes, "Failed to initiate content list population."); + error_display_res(NULL, NULL, listRes, "無法初始化档案列表"); free(loadingData); action_delete_free_data(data); return; } - info_display("Loading", "Press B to cancel.", false, loadingData, action_delete_loading_update, action_delete_loading_draw_top); + info_display("讀取中", "按B鍵取消", false, loadingData, action_delete_loading_update, action_delete_loading_draw_top); } void action_delete_file(linked_list* items, list_item* selected) { - action_delete_internal(items, selected, "Delete the selected file?", false, true, false, false); + action_delete_internal(items, selected, "即將刪除選中的档案，是否繼續？", false, true, false, false); } void action_delete_dir(linked_list* items, list_item* selected) { - action_delete_internal(items, selected, "Delete the current directory?", true, true, false, false); + action_delete_internal(items, selected, "即將刪除選中的資料夾，是否繼續？", true, true, false, false); } void action_delete_dir_contents(linked_list* items, list_item* selected) { - action_delete_internal(items, selected, "Delete all contents of the current directory?", true, false, false, false); + action_delete_internal(items, selected, "即將刪除資料夾中所有的档案，是否繼續？", true, false, false, false); } void action_delete_dir_cias(linked_list* items, list_item* selected) { - action_delete_internal(items, selected, "Delete all CIAs in the current directory?", false, false, true, false); + action_delete_internal(items, selected, "即將刪除資料夾中所有的 CIAs，是否繼續？", false, false, true, false); } void action_delete_dir_tickets(linked_list* items, list_item* selected) { - action_delete_internal(items, selected, "Delete all tickets in the current directory?", false, false, false, true); -} \ No newline at end of file + action_delete_internal(items, selected, "即將刪除資料夾中所有的 Tickets，是否繼續？", false, false, false, true); +} + +//　オケー \ No newline at end of file diff --git a/source/fbi/action/installcias.c b/source/fbi/action/installcias.c index f2fff75..dad6285 100644 --- a/source/fbi/action/installcias.c +++ b/source/fbi/action/installcias.c @@ -120,7 +120,7 @@ static Result action_install_cias_open_dst(void* data, u32 index, void* initialR bool n3ds = false; if(R_SUCCEEDED(APT_CheckNew3DS(&n3ds)) && !n3ds && ((info->ciaInfo.titleId >> 28) & 0xF) == 2) { - ui_view* view = prompt_display_yes_no("Confirmation", "Title is intended for New 3DS systems.\nContinue?", COLOR_TEXT, data, action_install_cias_draw_top, action_install_cias_n3ds_onresponse); + ui_view* view = prompt_display_yes_no("確認", "此程式是New 3DS專用程式\n是否繼續？", COLOR_TEXT, data, action_install_cias_draw_top, action_install_cias_n3ds_onresponse); if(view != NULL) { svcWaitSynchronization(view->active, U64_MAX); } @@ -180,7 +180,7 @@ static Result action_install_cias_restore(void* data, u32 index) { } bool action_install_cias_error(void* data, u32 index, Result res, ui_view** errorView) { - *errorView = error_display_res(data, action_install_cias_draw_top, res, "Failed to install CIA file."); + *errorView = error_display_res(data, action_install_cias_draw_top, res, "無法安裝 CIA 档案"); return true; } @@ -209,7 +209,7 @@ static void action_install_cias_update(ui_view* view, void* data, float* progres info_destroy(view); if(R_SUCCEEDED(installData->installInfo.result)) { - prompt_display_notify("Success", "Install finished.", COLOR_TEXT, NULL, NULL, NULL); + prompt_display_notify("成功", "已完成安裝", COLOR_TEXT, NULL, NULL, NULL); } action_install_cias_free_data(installData); @@ -222,7 +222,7 @@ static void action_install_cias_update(ui_view* view, void* data, float* progres } *progress = installData->installInfo.currTotal != 0 ? (float) ((double) installData->installInfo.currProcessed / (double) installData->installInfo.currTotal) : 0; - snprintf(text, PROGRESS_TEXT_MAX, "%lu / %lu\n%.2f %s / %.2f %s\n%.2f %s/s, ETA %s", installData->installInfo.processed, installData->installInfo.total, + snprintf(text, PROGRESS_TEXT_MAX, "%lu / %lu\n%.2f %s / %.2f %s\n%.2f %s/s, 剩余 %s", installData->installInfo.processed, installData->installInfo.total, ui_get_display_size(installData->installInfo.currProcessed), ui_get_display_size_units(installData->installInfo.currProcessed), ui_get_display_size(installData->installInfo.currTotal), @@ -238,9 +238,9 @@ static void action_install_cias_onresponse(ui_view* view, void* data, u32 respon if(response == PROMPT_YES) { Result res = task_data_op(&installData->installInfo); if(R_SUCCEEDED(res)) { - info_display("Installing CIA(s)", "Press B to cancel.", true, data, action_install_cias_update, action_install_cias_draw_top); + info_display("安裝 CIA(s)", "按B鍵取消", true, data, action_install_cias_update, action_install_cias_draw_top); } else { - error_display_res(NULL, NULL, res, "Failed to initiate CIA installation."); + error_display_res(NULL, NULL, res, "無法初始化安裝 CIA"); action_install_cias_free_data(installData); } @@ -273,9 +273,9 @@ static void action_install_cias_loading_update(ui_view* view, void* data, float* loadingData->installData->installInfo.total = linked_list_size(&loadingData->installData->contents); loadingData->installData->installInfo.processed = loadingData->installData->installInfo.total; - prompt_display_yes_no("Confirmation", loadingData->message, COLOR_TEXT, loadingData->installData, action_install_cias_draw_top, action_install_cias_onresponse); + prompt_display_yes_no("確認", loadingData->message, COLOR_TEXT, loadingData->installData, action_install_cias_draw_top, action_install_cias_onresponse); } else { - error_display_res(NULL, NULL, loadingData->popData.result, "Failed to populate CIA list."); + error_display_res(NULL, NULL, loadingData->popData.result, "無法列舉 CIA 目錄"); action_install_cias_free_data(loadingData->installData); } @@ -288,13 +288,13 @@ static void action_install_cias_loading_update(ui_view* view, void* data, float* svcSignalEvent(loadingData->popData.cancelEvent); } - snprintf(text, PROGRESS_TEXT_MAX, "Fetching CIA list..."); + snprintf(text, PROGRESS_TEXT_MAX, "獲取 CIA 目錄..."); } static void action_install_cias_internal(linked_list* items, list_item* selected, bool (*filter)(void* data, const char* name, u32 attributes), void* filterData, const char* message, bool delete) { install_cias_data* data = (install_cias_data*) calloc(1, sizeof(install_cias_data)); if(data == NULL) { - error_display(NULL, NULL, "Failed to allocate install CIAs data."); + error_display(NULL, NULL, "無法分配 CIA 安裝數據"); return; } @@ -304,7 +304,7 @@ static void action_install_cias_internal(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, true); if(R_FAILED(targetCreateRes)) { - error_display_res(NULL, NULL, targetCreateRes, "Failed to create target file item."); + error_display_res(NULL, NULL, targetCreateRes, "無法創建目標档案"); action_install_cias_free_data(data); return; @@ -346,7 +346,7 @@ static void action_install_cias_internal(linked_list* items, list_item* selected install_cias_loading_data* loadingData = (install_cias_loading_data*) calloc(1, sizeof(install_cias_loading_data)); if(loadingData == NULL) { - error_display(NULL, NULL, "Failed to allocate loading data."); + error_display(NULL, NULL, "無法分配讀取數據"); action_install_cias_free_data(data); return; @@ -369,28 +369,30 @@ static void action_install_cias_internal(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 CIA list population."); + error_display_res(NULL, NULL, listRes, "無法初始化 CIA 目錄結構"); free(loadingData); action_install_cias_free_data(data); return; } - info_display("Loading", "Press B to cancel.", false, loadingData, action_install_cias_loading_update, action_install_cias_loading_draw_top); + info_display("讀取", "按B鍵取消.", false, loadingData, action_install_cias_loading_update, action_install_cias_loading_draw_top); } void action_install_cia(linked_list* items, list_item* selected) { - action_install_cias_internal(items, selected, NULL, NULL, "Install the selected CIA?", false); + action_install_cias_internal(items, selected, NULL, NULL, "即將安裝所選的 CIA，是否繼續？", false); } void action_install_cia_delete(linked_list* items, list_item* selected) { - action_install_cias_internal(items, selected, NULL, NULL, "Install and delete the selected CIA?", true); + action_install_cias_internal(items, selected, NULL, NULL, "即將安裝並刪除所選的 CIA，是否繼續？", true); } void action_install_cias(linked_list* items, list_item* selected, bool (*filter)(void* data, const char* name, u32 attributes), void* filterData) { - action_install_cias_internal(items, selected, filter, filterData, "Install all CIAs in the current directory?", false); + action_install_cias_internal(items, selected, filter, filterData, "即將安裝資料夾中所有的 CIAs，是否繼續？", false); } void action_install_cias_delete(linked_list* items, list_item* selected, bool (*filter)(void* data, const char* name, u32 attributes), void* filterData) { - action_install_cias_internal(items, selected, filter, filterData, "Install and delete all CIAs in the current directory?", true); -} \ No newline at end of file + action_install_cias_internal(items, selected, filter, filterData, "即將安裝並刪除資料夾中所有的 CIAs，是否繼續？", true); +} + +//　オケー \ No newline at end of file diff --git a/source/fbi/action/rename.c b/source/fbi/action/rename.c index 275632f..07ec728 100644 --- a/source/fbi/action/rename.c +++ b/source/fbi/action/rename.c @@ -66,9 +66,9 @@ static void action_rename_onresponse(ui_view* view, void* data, SwkbdButton butt linked_list_sort(renameData->items, NULL, task_compare_files); - prompt_display_notify("Success", "Renamed.", COLOR_TEXT, NULL, NULL, NULL); + prompt_display_notify("成功", "已重命名", COLOR_TEXT, NULL, NULL, NULL); } else { - error_display_res(NULL, NULL, res, "Failed to perform rename."); + error_display_res(NULL, NULL, res, "無法重命名"); } } @@ -78,7 +78,7 @@ static void action_rename_onresponse(ui_view* view, void* data, SwkbdButton butt void action_rename(linked_list* items, list_item* selected) { rename_data* data = (rename_data*) calloc(1, sizeof(rename_data)); if(data == NULL) { - error_display(NULL, NULL, "Failed to allocate rename data."); + error_display(NULL, NULL, "無法分配重命名數據"); return; } @@ -86,5 +86,7 @@ void action_rename(linked_list* items, list_item* selected) { data->items = items; data->selected = selected; - kbd_display("Enter new name", ((file_info*) selected->data)->name, SWKBD_TYPE_NORMAL, 0, SWKBD_NOTEMPTY_NOTBLANK, FILE_NAME_MAX, data, action_rename_onresponse); -} \ No newline at end of file + kbd_display("輸入新的名字", ((file_info*) selected->data)->name, SWKBD_TYPE_NORMAL, 0, SWKBD_NOTEMPTY_NOTBLANK, FILE_NAME_MAX, data, action_rename_onresponse); +} + +// オケー \ No newline at end of file