From e2359ee04954e2707d8ed7a1ecbf45e144663408 Mon Sep 17 00:00:00 2001 From: Nebuleon Fumika Date: Sun, 13 Jan 2013 20:22:41 -0500 Subject: Localise Yes(A) and No(B) into English, French and Simplified Chinese as [A] Confirm and [B] Cancel. CATSFC/system/gui/sbutto.bmp: Widen the button to accomodate this change. --- CATSFC/system/gui/sbutto.bmp | Bin 2040 -> 2486 bytes CATSFC/system/language.msg | 56 ++++++++++++++++++++----------------------- source/nds/draw.c | 8 +++---- source/nds/gui.c | 10 ++++---- source/nds/message.h | 3 +++ 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/CATSFC/system/gui/sbutto.bmp b/CATSFC/system/gui/sbutto.bmp index a5e0943..2cad122 100644 Binary files a/CATSFC/system/gui/sbutto.bmp and b/CATSFC/system/gui/sbutto.bmp differ diff --git a/CATSFC/system/language.msg b/CATSFC/system/language.msg index 9395db1..d6889b0 100644 --- a/CATSFC/system/language.msg +++ b/CATSFC/system/language.msg @@ -105,6 +105,10 @@ Select a game Off #MSG_GENERAL_ON On +#MSG_GENERAL_CONFIRM_WITH_A +[A] Confirm +#MSG_GENERAL_CANCEL_WITH_B +[B] Cancel #MSG_AUDIO_ENABLED On #MSG_AUDIO_MUTED @@ -115,17 +119,15 @@ No game is currently loaded #MSG_SAVESTATE_FULL The current slot holds a state.\n -Do you wish to overwrite it?\n -[A] Overwrite [B] Cancel +Do you wish to overwrite it? #MSG_PROGRESS_SAVED_STATE_CREATING Saving state... #MSG_PROGRESS_SAVED_STATE_CREATION_FAILED -Failed!\n -[A] Retry [B] Cancel +Failed! #MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED OK! #MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT -No saved state is in the selected slot +No saved state here #MSG_PROGRESS_SAVED_STATE_CORRUPTED The game state file is not found or is corrupt. #MSG_PROGRESS_SAVED_STATE_LOADING @@ -139,11 +141,9 @@ Delete all saved states #FMT_SAVED_STATE_DELETE_ONE Delete saved state %d #MSG_DELETE_ALL_SAVESTATE_WARING -Really delete all saved states?\n -[A] Confirm [B] Cancel +Really delete all saved states? #FMT_DIALOG_SAVED_STATE_DELETE_ONE -Really delete saved state %d?\n -[A] Confirm [B] Cancel +Really delete saved state %d? #MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY There's already nothing here. #MSG_PROGRESS_SCREENSHOT_CREATING @@ -278,6 +278,10 @@ CPU主频 %d 关 #MSG_GENERAL_ON 开 +#MSG_GENERAL_CONFIRM_WITH_A +[A] 确认 +#MSG_GENERAL_CANCEL_WITH_B +[B] 取消 #MSG_AUDIO_ENABLED 开 #MSG_AUDIO_MUTED @@ -288,15 +292,11 @@ CPU主频 %d <没有加载> #MSG_SAVESTATE_FULL 当前存档槽已有存档文件,\n -覆盖已有存档吗?\n -按 A 键覆盖\n -按 B 键取消 +覆盖已有存档吗? #MSG_PROGRESS_SAVED_STATE_CREATING 正在写入... #MSG_PROGRESS_SAVED_STATE_CREATION_FAILED -写入存档失败!\n -按 A 键重试\n -按 B 键取消 +写入存档失败! #MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED 写入存档成功! #MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT @@ -314,13 +314,9 @@ CPU主频 %d #FMT_SAVED_STATE_DELETE_ONE 删除当前游戏的一个存档 %d #MSG_DIALOG_SAVED_STATE_DELETE_ALL -确定要删除所有存档吗？\n -按 A 键确定 \n -按 B 键取消 +确定要删除所有存档吗？ #FMT_DIALOG_SAVED_STATE_DELETE_ONE -确定要删除存档槽 %d 的存档吗? \n -按 A 键确定 \n -按 B 键取消 +确定要删除存档槽 %d 的存档吗? #MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY 没有存档可删除 #MSG_PROGRESS_SCREENSHOT_CREATING @@ -455,6 +451,10 @@ Sélectionner un jeu Hors fonction #MSG_GENERAL_ON En fonction +#MSG_GENERAL_CONFIRM_WITH_A +[A] Confirmer +#MSG_GENERAL_CANCEL_WITH_B +[B] Annuler #MSG_AUDIO_ENABLED Activé #MSG_AUDIO_MUTED @@ -465,17 +465,15 @@ Aucun jeu n'est actuellement chargé #MSG_SAVESTATE_FULL Il y a une sauvegarde dans cet emplacement.\n -Voulez-vous l'écraser?\n -[A] Écraser [B] Annuler +Voulez-vous l'écraser? #MSG_PROGRESS_SAVED_STATE_CREATING Sauvegarde en cours... #MSG_PROGRESS_SAVED_STATE_CREATION_FAILED -Échec!\n -[A] Réessayer [B] Annuler +Échec! #MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED Terminé! #MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT -Aucune sauvegarde dans cet emplacement +Aucune sauvegarde ici #MSG_PROGRESS_SAVED_STATE_CORRUPTED Le fichier de sauvegarde est introuvable ou corrompu. #MSG_PROGRESS_SAVED_STATE_LOADING @@ -489,11 +487,9 @@ Supprimer toutes les sauvegardes #FMT_SAVED_STATE_DELETE_ONE Supprimer l'emplacement %d #MSG_DELETE_ALL_SAVESTATE_WARING -Supprimer toutes les sauvegardes?\n -[A] Confirmer [B] Annuler +Supprimer toutes les sauvegardes? #FMT_DIALOG_SAVED_STATE_DELETE_ONE -Supprimer l'emplacement %d?\n -[A] Confirmer [B] Annuler +Supprimer l'emplacement %d? #MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY Cet emplacement est déjà vide. #MSG_PROGRESS_SCREENSHOT_CREATING diff --git a/source/nds/draw.c b/source/nds/draw.c index b3c5698..d739dc9 100644 --- a/source/nds/draw.c +++ b/source/nds/draw.c @@ -113,7 +113,7 @@ struct gui_iconlist gui_icon_list[]= { /* 37 */ {"nbacko", 19, 13, NULL}, /* 38 */ {"chtfile", 16, 15, NULL}, /* 39 */ {"smsgfr", 193, 111, NULL}, - /* 40 */ {"sbutto", 61, 16, NULL} + /* 40 */ {"sbutto", 76, 16, NULL} }; @@ -800,16 +800,16 @@ u32 draw_yesno_dialog(enum SCREEN_ID screen, u32 sy, char *yes, char *no) i= SCREEN_WIDTH/2 - box_width - 2; // drawbox(screen_address, i, sy-1, i+box_width-1, sy+FONTS_HEIGHT, COLOR16(8, 8, 8)); // drawboxfill(screen_address, i+1, sy, i+box_width-2, sy+FONTS_HEIGHT-1, COLOR16(15, 15, 15)); - show_icon((unsigned short*)screen_addr, &ICON_BUTTON, 64, 128); + show_icon((unsigned short*)screen_addr, &ICON_BUTTON, 49, 128); // draw_string_vcenter(screen_address, i+1, sy+1, box_width, COLOR_WHITE, yes); - draw_string_vcenter((unsigned short*)screen_addr, 66, 130, 58, COLOR_WHITE, yes); + draw_string_vcenter((unsigned short*)screen_addr, 51, 130, 73, COLOR_WHITE, yes); i= SCREEN_WIDTH/2 + 3; // drawbox(screen_address, i, sy-1, i+box_width-1, sy+FONTS_HEIGHT, COLOR16(8, 8, 8)); // drawboxfill(screen_address, i+1, sy, i+box_width-2, sy+FONTS_HEIGHT-1, COLOR16(15, 15, 15)); show_icon((unsigned short*)screen_addr, &ICON_BUTTON, 136, 128); // draw_string_vcenter(screen_address, i+1, sy+1, box_width, COLOR_WHITE, no); - draw_string_vcenter((unsigned short*)screen_addr, 138, 130, 58, COLOR_WHITE, no); + draw_string_vcenter((unsigned short*)screen_addr, 138, 130, 73, COLOR_WHITE, no); ds2_flipScreen(screen, 2); diff --git a/source/nds/gui.c b/source/nds/gui.c index 00c8633..d545edf 100644 --- a/source/nds/gui.c +++ b/source/nds/gui.c @@ -1239,7 +1239,7 @@ u32 play_screen_snapshot(void) //construct filelist_info struct manage_filelist_info(&filelist_info, -1); - if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)")) + if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B])) return 1; else return 0; @@ -2031,7 +2031,7 @@ u32 menu(u16 *screen) { draw_message(down_screen_addr, NULL, 28, 31, 227, 165, 0); draw_string_vcenter(down_screen_addr, 36, 74, 190, COLOR_MSSG, msg[MSG_SAVESTATE_FULL]); - if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)") == 0) + if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B]) == 0) return; clear_savestate_slot(0); @@ -2165,7 +2165,7 @@ u32 menu(u16 *screen) if(flag) { - if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)")) + if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B])) { wait_Allkey_release(0); for(i= 0; i < SAVE_STATE_SLOT_NUM; i++) @@ -2196,7 +2196,7 @@ u32 menu(u16 *screen) sprintf(line_buffer, msg[FMT_DIALOG_SAVED_STATE_DELETE_ONE], delette_savestate_num); draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, line_buffer); - if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)")) { + if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B])) { wait_Allkey_release(0); clear_savestate_slot(delette_savestate_num); } @@ -2650,7 +2650,7 @@ u32 menu(u16 *screen) draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color); draw_string_vcenter(down_screen_addr, 36, 70, 190, COLOR_MSSG, msg[MSG_DIALOG_RESET]); - if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes", "No")) + if(draw_yesno_dialog(DOWN_SCREEN, 115, msg[MSG_GENERAL_CONFIRM_WITH_A], msg[MSG_GENERAL_CANCEL_WITH_B])) { wait_Allkey_release(0); draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color); diff --git a/source/nds/message.h b/source/nds/message.h index 09332bc..ded5925 100644 --- a/source/nds/message.h +++ b/source/nds/message.h @@ -71,6 +71,9 @@ enum MSG MSG_GENERAL_OFF, MSG_GENERAL_ON, + MSG_GENERAL_CONFIRM_WITH_A, + MSG_GENERAL_CANCEL_WITH_B, + MSG_AUDIO_ENABLED, MSG_AUDIO_MUTED, -- cgit v1.2.3