Language message overhaul, part 1.

Clean up the names of messages. Mark those that are unused as such in code comments. Raise the CPU level while loading a message file, because it really does take half a second to load a 16 KB file on the lowest frequency (what the eff?).

4 files changed, 484 insertions, 639 deletions

diff --git a/CATSFC/system/language.msg b/CATSFC/system/language.msg
index 86eb274..8f0f3b7 100644
--- a/CATSFC/system/language.msg
+++ b/CATSFC/system/language.msg
@@ -13,61 +13,61 @@ ENDCOMMENT
 
 STARTENGLISH
 
-#MSG_MAIN_MENU_0
+#MSG_MAIN_MENU_VIDEO_AUDIO
 Video & audio
 
-#MSG_MAIN_MENU_1
+#MSG_MAIN_MENU_SAVED_STATES
 Saved states
 
-#MSG_MAIN_MENU_2
+#MSG_MAIN_MENU_CHEATS
 Cheats
 
-#MSG_MAIN_MENU_3
+#MSG_MAIN_MENU_TOOLS
 Tools
 
-#MSG_MAIN_MENU_4
+#MSG_MAIN_MENU_OPTIONS
 Options
 
-#MSG_MAIN_MENU_5
+#MSG_MAIN_MENU_EXIT
 Exit
 
-#MSG_SUB_MENU_00
+#FMT_VIDEO_ASPECT_RATIO
 Aspect ratio    %s
 
-#MSG_SUB_MENU_01
+#MSG_VIDEO_FAST_FORWARD
 Fast-forward  %s
 
-#MSG_SUB_MENU_02
+#FMT_VIDEO_FRAME_SKIP_AUTOMATIC
 Frame skipping        %s
 
-#MSG_SUB_MENU_03
+#FMT_VIDEO_FRAME_SKIP_MANUAL
 Frame skipping        %d
 
-#MSG_SUB_MENU_04
+#FMT_AUDIO_SOUND
 Sound              %s
 
 #MSG_SUB_MENU_05
 Back
 
-#MSG_SUB_MENU_10
+#MSG_SAVED_STATE_CREATE
 Create saved state
 
-#MSG_SUB_MENU_11
+#FMT_SAVED_STATE_LOAD
 Load saved state          %d
 
 #MSG_SUB_MENU_12
 Select save slot
 
-#MSG_SUB_MENU_13
+#MSG_SAVED_STATE_DELETE_GENERAL
 Delete saved states...
 
 #MSG_SUB_MENU_14
 Back
 
-#MSG_SUB_MENU_20
+#FMT_CHEAT_PAGE
 Cheat page %d
 
-#MSG_SUB_MENU_21
+#MSG_CHEAT_LOAD_FROM_FILE
 Load cheat file
 
 #MSG_SUB_MENU_22
@@ -79,7 +79,7 @@ Load cheats
 #MSG_SUB_MENU_24
 Back
 
-#MSG_SUB_MENU_30
+#MSG_TOOLS_SCREENSHOT_GENERAL
 Screenshots...
 
 #MSG_SUB_MENU_31
@@ -91,25 +91,25 @@ Keep information for  %s second(s)
 #MSG_SUB_MENU_40
 Auto standby          %s
 
-#MSG_SUB_MENU_41
+#FMT_OPTIONS_LANGUAGE
 Language                          %s
 
-#MSG_SUB_MENU_42
+#FMT_OPTIONS_CPU_FREQUENCY
 CPU frequency                 %d
 
 #MGS_SUB_MENU_43
 Card capacity
 
-#MSG_SUB_MENU_44
+#MSG_OPTIONS_RESET
 Restore default settings
 
-#MSG_SUB_MENU_45
+#MSG_OPTIONS_VERSION
 Version information
 
-#MSG_SUB_MENU_300
+#MSG_SCREENSHOT_CREATE
 Save a screenshot
 
-#MSG_SUB_MENU_301
+#MSG_SCREENSHOT_BROWSE
 Browse screenshots
 
 #MSG_SUB_MENU_302
@@ -133,28 +133,28 @@ Awaken Menu            %s
 #MSG_SUB_MENU_315
 Back                           NDS key
 
-#MSG_SUB_MENU_60
+#MSG_LOAD_GAME_RECENTLY_PLAYED
 Recently played games
 
-#MSG_SUB_MENU_61
+#MSG_LOAD_GAME_FROM_CARD
 Select a game from the card
 
-#MSG_SUB_MENU_62
+#MSG_LOAD_GAME_MENU_TITLE
 Select a game
 
-#MSG_SCREEN_RATIO_0
+#MSG_VIDEO_ASPECT_RATIO_0
 [0] Entire screen
 
-#MSG_SCREEN_RATIO_1
+#MSG_VIDEO_ASPECT_RATIO_1
 [1] Bottom, square pixels
 
-#MSG_SCREEN_RATIO_2,
+#MSG_VIDEO_ASPECT_RATIO_2
 [2] Top, square pixels
 
-#MSG_SCREEN_RATIO_3,
+#MSG_VIDEO_ASPECT_RATIO_3
 [3] Middle, square pixels
 
-#MSG_SCREEN_RATIO_4,
+#MSG_VIDEO_ASPECT_RATIO_4
 [4] Entire screen, antialiased
 
 #MSG_FRAMESKIP_0
@@ -169,10 +169,10 @@ Off
 #MSG_ON_OFF_1
 On
 
-#MSG_SOUND_SWITCH_0
+#MSG_AUDIO_ENABLED
 On
 
-#MSG_SOUND_SWITCH_1
+#MSG_AUDIO_MUTED
 Mute
 
 #MSG_SNAP_FRAME_0
@@ -187,10 +187,10 @@ Disable
 #MSG_EN_DIS_ABLE_1
 Enable
 
-#MSG_NONE_LOAD_GAME
+#MSG_TOP_SCREEN_NO_GAME_LOADED
 No game is currently loaded
 
-#MSG_CHEAT_MENU_NON_LOAD
+#MSG_CHEAT_ELEMENT_NOT_LOADED
 <None loaded here>
 
 #MSG_CHEAT_MENU_0
@@ -258,29 +258,29 @@ The current slot holds a state.\n
 Do you wish to overwrite it?\n
 [A] Overwrite  [B] Cancel
 
-#MSG_SAVESTATE_DOING
+#MSG_PROGRESS_SAVED_STATE_CREATING
 Saving state...
 
-#MSG_SAVESTATE_FAILURE
+#MSG_PROGRESS_SAVED_STATE_CREATION_FAILED
 Failed!\n
 [A] Retry  [B] Cancel
 
-#MSG_SAVESTATE_SUCCESS
+#MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED
 OK!
 
-#MSG_SAVESTATE_SLOT_EMPTY
-No saved state
+#MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT
+No saved state is in the selected slot
 
-#MSG_SAVESTATE_FILE_BAD
+#MSG_PROGRESS_SAVED_STATE_CORRUPTED
 The game state file is not found or is corrupt.
 
-#MSG_LOADSTATE_DOING
+#MSG_PROGRESS_SAVED_STATE_LOADING
 Loading...
 
-#MSG_LOADSTATE_FAILURE
+#MSG_PROGRESS_SAVED_STATE_LOAD_FAILED
 Failed!
 
-#MSG_LOADSTATE_SUCCESS
+#MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED
 OK!
 
 #MSG_WARING_DIALOG
@@ -289,30 +289,30 @@ Press any key to return.
 #MSG_TIME_FORMATE
 Time
 
-#MSG_SUB_MENU_130
+#MSG_SAVED_STATE_DELETE_ALL
 Delete all saved states
 
-#MSG_SUB_MENU_131
+#FMT_SAVED_STATE_DELETE_ONE
 Delete saved state %d
 
 #MSG_DELETE_ALL_SAVESTATE_WARING
 Really delete all saved states?\n
 [A] Confirm  [B] Cancel
 
-#MSG_DELETE_SINGLE_SAVESTATE_WARING
+#FMT_DIALOG_SAVED_STATE_DELETE_ONE
 Really delete saved state %d?\n
 [A] Confirm  [B] Cancel
 
-#MSG_DELETE_SAVESTATE_NOTHING
+#MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY
 There's already nothing here.
 
-#MSG_SAVE_SNAPSHOT
+#MSG_PROGRESS_SCREENSHOT_CREATING
 Saving a screenshot...
 
-#MSG_SAVE_SNAPSHOT_COMPLETE
+#MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED
 OK!
 
-#MSG_SAVE_SNAPSHOT_FAILURE
+#MSG_PROGRESS_SCREENSHOT_CREATION_FAILED
 Failed!
 
 #MSG_CHANGE_LANGUAGE
@@ -348,19 +348,19 @@ Key A     Pause
 #MSG_PLAY_SLIDE6
 Key B     Return to the menu
 
-#MSG_LOADING_GMAE
+#MSG_PROGRESS_LOADING_GAME
 Loading...
 
-#MSG_EMU_VERSION0
+#MSG_EMULATOR_NAME
 CATSFC SNES emulator
 
-#MSG_EMU_VERSION1
+#MSG_WORD_EMULATOR_VERSION
 Version
 
-#MSG_LOAD_DEFAULT_WARING,
+#MSG_DIALOG_RESET
 Reset all settings to defaults?
 
-#MSG_DEFAULT_LOADING
+#MSG_PROGRESS_RESETTING
 Please wait...
 
 #MSG_BACK
@@ -372,61 +372,61 @@ ENDENGLISH
 
 STARTCHINESESIM
 
-#MSG_MAIN_MENU_0
+#MSG_MAIN_MENU_VIDEO_AUDIO
 图像声音
 
-#MSG_MAIN_MENU_1
+#MSG_MAIN_MENU_SAVED_STATES
 存档
 
-#MSG_MAIN_MENU_2
+#MSG_MAIN_MENU_CHEATS
 作弊器
 
-#MSG_MAIN_MENU_3
+#MSG_MAIN_MENU_TOOLS
 工具
 
-#MSG_MAIN_MENU_4
+#MSG_MAIN_MENU_OPTIONS
 综合设置
 
-#MSG_MAIN_MENU_5
+#MSG_MAIN_MENU_EXIT
 退出模拟器
 
-#MSG_SUB_MENU_00
+#FMT_VIDEO_ASPECT_RATIO
 画面                       %s
 
-#MSG_SUB_MENU_01
+#MSG_VIDEO_FAST_FORWARD
 游戏快进                 %s
 
-#MSG_SUB_MENU_02
+#FMT_VIDEO_FRAME_SKIP_AUTOMATIC
 跳帧方式                 %s
 
-#MSG_SUB_MENU_03
+#FMT_VIDEO_FRAME_SKIP_MANUAL
 跳帧级别                 %d
 
-#MSG_SUB_MENU_04
+#FMT_AUDIO_SOUND
 声音开关                 %s
 
 #MSG_SUB_MENU_05
 返回
 
-#MSG_SUB_MENU_10
+#MSG_SAVED_STATE_CREATE
 写入存档
 
-#MSG_SUB_MENU_11
+#FMT_SAVED_STATE_LOAD
 读取存档                        %d
 
 #MSG_SUB_MENU_12
 存档槽选择
 
-#MSG_SUB_MENU_13
+#MSG_SAVED_STATE_DELETE_GENERAL
 删除存档
 
 #MSG_SUB_MENU_14
 返回
 
-#MSG_SUB_MENU_20
+#FMT_CHEAT_PAGE
 作弊代码页   %d
 
-#MSG_SUB_MENU_21
+#MSG_CHEAT_LOAD_FROM_FILE
 加载作弊代码文件
 
 #MSG_SUB_MENU_22
@@ -438,7 +438,7 @@ STARTCHINESESIM
 #MSG_SUB_MENU_24
 返回
 
-#MSG_SUB_MENU_30
+#MSG_TOOLS_SCREENSHOT_GENERAL
 屏幕快照
 
 #MSG_SUB_MENU_31
@@ -450,25 +450,25 @@ STARTCHINESESIM
 #MSG_SUB_MENU_40
 自动待机                  %s
 
-#MSG_SUB_MENU_41
+#FMT_OPTIONS_LANGUAGE
 语言                               %s
 
-#MSG_SUB_MENU_42
+#FMT_OPTIONS_CPU_FREQUENCY
 CPU主频                          %d
 
 #MGS_SUB_MENU_43
 卡容量
 
-#MSG_SUB_MENU_44
+#MSG_OPTIONS_RESET
 缺省设置
 
-#MSG_SUB_MENU_45
+#MSG_OPTIONS_VERSION
 版本信息
 
-#MSG_SUB_MENU_300
+#MSG_SCREENSHOT_CREATE
 保存屏幕快照
 
-#MSG_SUB_MENU_301
+#MSG_SCREENSHOT_BROWSE
 浏览屏幕快照
 
 #MSG_SUB_MENU_302
@@ -492,27 +492,30 @@ SFC 按键    A               %s
 #MSG_SUB_MENU_315
 返回                           NDS 按键
 
-#MSG_SUB_MENU_60
+#MSG_LOAD_GAME_RECENTLY_PLAYED
 最近玩过的游戏
 
-#MSG_SUB_MENU_61
+#MSG_LOAD_GAME_FROM_CARD
 新游戏
 
-#MSG_SUB_MENU_62
+#MSG_LOAD_GAME_MENU_TITLE
 装载游戏
 
-#MSG_SCREEN_RATIO_0
+#MSG_VIDEO_ASPECT_RATIO_0
 显示模式 0
 
-#MSG_SCREEN_RATIO_1
+#MSG_VIDEO_ASPECT_RATIO_1
 显示模式 1
 
-#MSG_SCREEN_RATIO_2,
+#MSG_VIDEO_ASPECT_RATIO_2
 显示模式 2
 
-#MSG_SCREEN_RATIO_3,
+#MSG_VIDEO_ASPECT_RATIO_3
 显示模式 3
 
+#MSG_VIDEO_ASPECT_RATIO_4
+显示模式 4
+
 #MSG_FRAMESKIP_0
 手动
 
@@ -525,10 +528,10 @@ SFC 按键    A               %s
 #MSG_ON_OFF_1
 开
 
-#MSG_SOUND_SWITCH_0
+#MSG_AUDIO_ENABLED
 开
 
-#MSG_SOUND_SWITCH_1
+#MSG_AUDIO_MUTED
 静音
 
 #MSG_SNAP_FRAME_0
@@ -543,10 +546,10 @@ SFC 按键    A               %s
 #MSG_EN_DIS_ABLE_1
 允许
 
-#MSG_NONE_LOAD_GAME
+#MSG_TOP_SCREEN_NO_GAME_LOADED
 没有加载游戏
 
-#MSG_CHEAT_MENU_NON_LOAD
+#MSG_CHEAT_ELEMENT_NOT_LOADED
 <没有加载>
 
 #MSG_CHEAT_MENU_LOADED
@@ -616,30 +619,30 @@ Y
 按 B 键取消
 
 
-#MSG_SAVESTATE_DOING
+#MSG_PROGRESS_SAVED_STATE_CREATING
 正在写入...
 
-#MSG_SAVESTATE_FAILURE
+#MSG_PROGRESS_SAVED_STATE_CREATION_FAILED
 写入存档失败!\n
 按 A 键重试\n
 按 B 键取消
 
-#MSG_SAVESTATE_SUCCESS
+#MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED
 写入存档成功!
 
-#MSG_SAVESTATE_SLOT_EMPTY
+#MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT
 没有游戏截图
 
-#MSG_SAVESTATE_FILE_BAD
+#MSG_PROGRESS_SAVED_STATE_CORRUPTED
 存档文件找不到或者损坏!
 
-#MSG_LOADSTATE_DOING
+#MSG_PROGRESS_SAVED_STATE_LOADING
 正在加载...
 
-#MSG_LOADSTATE_FAILURE
+#MSG_PROGRESS_SAVED_STATE_LOAD_FAILED
 加载存档失败
 
-#MSG_LOADSTATE_SUCCESS
+#MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED
 加载存档成功
 
 #MSG_WARING_DIALOG
@@ -648,10 +651,10 @@ Y
 #MSG_TIME_FORMATE
 时间
 
-#MSG_SUB_MENU_130
+#MSG_SAVED_STATE_DELETE_ALL
 删除当前游戏的所有存档
 
-#MSG_SUB_MENU_131
+#FMT_SAVED_STATE_DELETE_ONE
 删除当前游戏的一个存档         %d
 
 #MSG_DELETE_ALL_SAVESTATE_WARING
@@ -659,21 +662,21 @@ Y
 按 A 键确定 \n
 按 B 键取消
 
-#MSG_DELETE_SINGLE_SAVESTATE_WARING
+#FMT_DIALOG_SAVED_STATE_DELETE_ONE
 确定要删除存档槽 %d 的存档吗? \n
 按 A 键确定 \n
 按 B 键取消
 
-#MSG_DELETE_SAVESTATE_NOTHING
+#MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY
 没有存档可删除
 
-#MSG_SAVE_SNAPSHOT
+#MSG_PROGRESS_SCREENSHOT_CREATING
 正在保存屏幕快照...
 
-#MSG_SAVE_SNAPSHOT_CONPLETE
+#MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED
 完成!
 
-#MSG_SAVE_SNAPSHOT_FAILURE
+#MSG_PROGRESS_SCREENSHOT_CREATION_FAILED
 失败!
 
 #MSG_CHANGE_LANGUAGE
@@ -709,19 +712,19 @@ Y
 #MSG_PLAY_SLIDE6
 按键 B   返回菜单
 
-#MSG_LOADING_GMAE
+#MSG_PROGRESS_LOADING_GAME
 正在装载游戏...
 
-#MSG_EMU_VERSION0
+#MSG_EMULATOR_NAME
 SFC模拟器
 
-#MSG_EMU_VERSION1
+#MSG_WORD_EMULATOR_VERSION
 版本
 
-#MSG_LOAD_DEFAULT_WARING,
+#MSG_DIALOG_RESET
 确定将 SFC模拟器恢复为出厂设置吗?
 
-#MSG_DEFAULT_LOADING
+#MSG_PROGRESS_RESETTING
 正在设置,请稍候...
 
 #MSG_BACK
@@ -732,61 +735,61 @@ ENDCHINESESIM
 
 STARTFRENCH
 
-#MSG_MAIN_MENU_0
+#MSG_MAIN_MENU_VIDEO_AUDIO
 Vidéo & audio
 
-#MSG_MAIN_MENU_1
+#MSG_MAIN_MENU_SAVED_STATES
 Sauvegardes
 
-#MSG_MAIN_MENU_2
+#MSG_MAIN_MENU_CHEATS
 Triche
 
-#MSG_MAIN_MENU_3
+#MSG_MAIN_MENU_TOOLS
 Outils
 
-#MSG_MAIN_MENU_4
+#MSG_MAIN_MENU_OPTIONS
 Options
 
-#MSG_MAIN_MENU_5
+#MSG_MAIN_MENU_EXIT
 Quitter
 
-#MSG_SUB_MENU_00
+#FMT_VIDEO_ASPECT_RATIO
 Format d'image      %s
 
-#MSG_SUB_MENU_01
+#MSG_VIDEO_FAST_FORWARD
 Avance rapide       %s
 
-#MSG_SUB_MENU_02
+#FMT_VIDEO_FRAME_SKIP_AUTOMATIC
 Omission d'images  %s
 
-#MSG_SUB_MENU_03
+#FMT_VIDEO_FRAME_SKIP_MANUAL
 Images omises      %d
 
-#MSG_SUB_MENU_04
+#FMT_AUDIO_SOUND
 Son                         %s
 
 #MSG_SUB_MENU_05
 Retour
 
-#MSG_SUB_MENU_10
+#MSG_SAVED_STATE_CREATE
 Créer une sauvegarde
 
-#MSG_SUB_MENU_11
+#FMT_SAVED_STATE_LOAD
 Charger la sauvegarde   %d
 
 #MSG_SUB_MENU_12
 Sélectionner l'emplacement
 
-#MSG_SUB_MENU_13
+#MSG_SAVED_STATE_DELETE_GENERAL
 Supprimer une/des sauvegardes...
 
 #MSG_SUB_MENU_14
 Retour
 
-#MSG_SUB_MENU_20
+#FMT_CHEAT_PAGE
 Page de codes de triche : %d
 
-#MSG_SUB_MENU_21
+#MSG_CHEAT_LOAD_FROM_FILE
 Charger un fichier de triche
 
 #MSG_SUB_MENU_22
@@ -798,7 +801,7 @@ Charger la triche
 #MSG_SUB_MENU_24
 Retour
 
-#MSG_SUB_MENU_30
+#MSG_TOOLS_SCREENSHOT_GENERAL
 Captures d'écran...
 
 #MSG_SUB_MENU_31
@@ -810,25 +813,25 @@ Gardes les informations pour  %s seconde(s)
 #MSG_SUB_MENU_40
 Mise en veille automatique     %s
 
-#MSG_SUB_MENU_41
+#FMT_OPTIONS_LANGUAGE
 Langue                              %s
 
-#MSG_SUB_MENU_42
+#FMT_OPTIONS_CPU_FREQUENCY
 Fréquence CPU                  %d
 
-#MGS_SUB_MENU_43
+#MSG_OPTIONS_CARD_CAPACITY
 Capacité de la carte
 
-#MSG_SUB_MENU_44
+#MSG_OPTIONS_RESET
 Remettre les paramètres à zéro
 
-#MSG_SUB_MENU_45
+#MSG_OPTIONS_VERSION
 Version
 
-#MSG_SUB_MENU_300
+#MSG_SCREENSHOT_CREATE
 Créer une capture d'écran
 
-#MSG_SUB_MENU_301
+#MSG_SCREENSHOT_BROWSE
 Parcourir les captures d'écran
 
 #MSG_SUB_MENU_302
@@ -852,28 +855,28 @@ Afficher le menu %s
 #MSG_SUB_MENU_315
 Touche de retour NDS
 
-#MSG_SUB_MENU_60
+#MSG_LOAD_GAME_RECENTLY_PLAYED
 Jeux joués récemment
 
-#MSG_SUB_MENU_61
+#MSG_LOAD_GAME_FROM_CARD
 Sélectionner un jeu de la carte
 
-#MSG_SUB_MENU_62
+#MSG_LOAD_GAME_MENU_TITLE
 Sélectionner un jeu
 
-#MSG_SCREEN_RATIO_0
+#MSG_VIDEO_ASPECT_RATIO_0
 [0] Écran entier
 
-#MSG_SCREEN_RATIO_1
+#MSG_VIDEO_ASPECT_RATIO_1
 [1] Bas, pixels carrés
 
-#MSG_SCREEN_RATIO_2,
+#MSG_VIDEO_ASPECT_RATIO_2
 [2] Haut, pixels carrés
 
-#MSG_SCREEN_RATIO_3,
+#MSG_VIDEO_ASPECT_RATIO_3
 [3] Milieu, pixels carrés
 
-#MSG_SCREEN_RATIO_4,
+#MSG_VIDEO_ASPECT_RATIO_4
 [4] Écran entier anticrénelé
 
 #MSG_FRAMESKIP_0
@@ -888,10 +891,10 @@ Hors fonction
 #MSG_ON_OFF_1
 En fonction
 
-#MSG_SOUND_SWITCH_0
+#MSG_AUDIO_ENABLED
 Activé
 
-#MSG_SOUND_SWITCH_1
+#MSG_AUDIO_MUTED
 Muet
 
 #MSG_SNAP_FRAME_0
@@ -906,10 +909,10 @@ Désactiver
 #MSG_EN_DIS_ABLE_1
 Activer
 
-#MSG_NONE_LOAD_GAME
+#MSG_TOP_SCREEN_NO_GAME_LOADED
 Aucun jeu n'est actuellement chargé
 
-#MSG_CHEAT_MENU_NON_LOAD
+#MSG_CHEAT_ELEMENT_NOT_LOADED
 <Aucun chargé ici>
 
 #MSG_CHEAT_MENU_0
@@ -977,29 +980,29 @@ Il y a une sauvegarde dans cet emplacement.\n
 Voulez-vous l'écraser?\n
 [A] Écraser  [B] Annuler
 
-#MSG_SAVESTATE_DOING
+#MSG_PROGRESS_SAVED_STATE_CREATING
 Sauvegarde en cours...
 
-#MSG_SAVESTATE_FAILURE
+#MSG_PROGRESS_SAVED_STATE_CREATION_FAILED
 Échec!\n
 [A] Réessayer  [B] Annuler
 
-#MSG_SAVESTATE_SUCCESS
+#MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED
 Terminé!
 
-#MSG_SAVESTATE_SLOT_EMPTY
-Aucune sauvegarde
+#MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT
+Aucune sauvegarde dans cet emplacement
 
-#MSG_SAVESTATE_FILE_BAD
+#MSG_PROGRESS_SAVED_STATE_CORRUPTED
 Le fichier de sauvegarde est introuvable ou corrompu.
 
-#MSG_LOADSTATE_DOING
+#MSG_PROGRESS_SAVED_STATE_LOADING
 Chargement en cours...
 
-#MSG_LOADSTATE_FAILURE
+#MSG_PROGRESS_SAVED_STATE_LOAD_FAILED
 Échec!
 
-#MSG_LOADSTATE_SUCCESS
+#MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED
 Terminé!
 
 #MSG_WARING_DIALOG
@@ -1008,30 +1011,30 @@ Appuyez sur une touche pour continuer.
 #MSG_TIME_FORMATE
 Date
 
-#MSG_SUB_MENU_130
+#MSG_SAVED_STATE_DELETE_ALL
 Supprimer toutes les sauvegardes
 
-#MSG_SUB_MENU_131
+#FMT_SAVED_STATE_DELETE_ONE
 Supprimer l'emplacement %d
 
 #MSG_DELETE_ALL_SAVESTATE_WARING
 Supprimer toutes les sauvegardes?\n
 [A] Confirmer  [B] Annuler
 
-#MSG_DELETE_SINGLE_SAVESTATE_WARING
+#FMT_DIALOG_SAVED_STATE_DELETE_ONE
 Supprimer l'emplacement %d?\n
 [A] Confirmer  [B] Annuler
 
-#MSG_DELETE_SAVESTATE_NOTHING
+#MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY
 Cet emplacement est déjà vide.
 
-#MSG_SAVE_SNAPSHOT
+#MSG_PROGRESS_SCREENSHOT_CREATING
 Capture de l'écran...
 
-#MSG_SAVE_SNAPSHOT_COMPLETE
+#MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED
 Terminé!
 
-#MSG_SAVE_SNAPSHOT_FAILURE
+#MSG_PROGRESS_SCREENSHOT_CREATION_FAILED
 Échec!
 
 #MSG_CHANGE_LANGUAGE
@@ -1067,19 +1070,19 @@ A           Pause
 #MSG_PLAY_SLIDE6
 B           Retour au menu
 
-#MSG_LOADING_GMAE
+#MSG_PROGRESS_LOADING_GAME
 Chargement...
 
-#MSG_EMU_VERSION0
+#MSG_EMULATOR_NAME
 Émulateur SNES CATSFC
 
-#MSG_EMU_VERSION1
+#MSG_WORD_EMULATOR_VERSION
 Version
 
-#MSG_LOAD_DEFAULT_WARING,
+#MSG_DIALOG_RESET
 Remettre tous les paramètres à zéro?
 
-#MSG_DEFAULT_LOADING
+#MSG_PROGRESS_RESETTING
 Veuillez patienter...
 
 #MSG_BACK
diff --git a/README.md b/README.md
index 256e0f1..c4c1ffa 100644
--- a/README.md
+++ b/README.md
@@ -109,14 +109,12 @@ need to do the following:
   be `, (char *) &lang[3]`.

 * Still in `source/nds/gui.c`, find `case CHINESE_SIMPLIFIED`. Copy the lines

   starting at the `case` and ending with `break`, inclusively. Paste them

-  before the `}`. Change the language name and tags, and update the `cmplen`

-  to be the length of the `START` tag. For the example of German, you would

-  use `cmplen= 11;`, because that's the length of `STARTGERMAN`:

+  before the `}`. Change the language name and tags. For the example of

+  German, you would use:

   ```

 	case GERMAN:

 		strcpy(start, "STARTGERMAN");

 		strcpy(end, "ENDGERMAN");

-		cmplen = 11;

 		break;

   ```

 

diff --git a/source/nds/gui.c b/source/nds/gui.c
index 71b51e6..4b3d814 100644
--- a/source/nds/gui.c
+++ b/source/nds/gui.c
@@ -112,7 +112,7 @@ static unsigned int savestate_index;
   passive_function,                                                           \
   NULL,                                                                       \
   &cheat_data_ptr[number],                                                    \
-  enable_disable_options,                                                     \
+  NULL /* enable_disable_options */,                                                     \
   &(Cheat.c[number].enabled),				                            	  \
   2,                                                                          \
   NULL,                                                                       \
@@ -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(A)"))
+        if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes(A)", "No(B)"))
             return 1;
         else 
             return 0;
@@ -1683,13 +1683,11 @@ u32 menu(u16 *screen)
 	auto void menu_load_state();
 	auto void menu_load_cheat_file();
 	auto void others_menu_init();
-	auto void keyremap_show();
 	auto void main_menu_passive();
 	auto void main_menu_key();
 	auto void delette_savestate();
 	auto void save_screen_snapshot();
 	auto void browse_screen_snapshot();
-	auto void keyremap();
 	auto void time_backward_action();
 	auto void time_period_passive();
 	auto void time_period_action();
@@ -1748,7 +1746,7 @@ u32 menu(u16 *screen)
 			strcat(line_buffer, tmp_filename);
 
 			draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color); 
-			draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_LOADING_GAME]);
+			draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_PROGRESS_LOADING_GAME]);
 			ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 
 			ds2_setCPUclocklevel(13);
@@ -1816,7 +1814,7 @@ u32 menu(u16 *screen)
 		fat_remove("plgargs.dat");
 	
 		draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color); 
-		draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_LOADING_GAME]);
+		draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_PROGRESS_LOADING_GAME]);
 		ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 
 		ds2_setCPUclocklevel(13);
@@ -2046,7 +2044,7 @@ u32 menu(u16 *screen)
 				get_savestate_filename(slot_index, tmp_filename);
 
 				draw_message(down_screen_addr, NULL, 28, 31, 227, 165, 0);
-				draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_SAVESTATE_DOING]);
+				draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_CREATING]);
 				ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 
 				int flag = save_state(tmp_filename, (void*)screen);
@@ -2054,12 +2052,12 @@ u32 menu(u16 *screen)
 				draw_message(down_screen_addr, NULL, 28, 31, 227, 96, 0);
 				if(flag < 0)
 				{
-					draw_string_vcenter(down_screen_addr, 36, 74, 190, COLOR_MSSG, msg[MSG_SAVESTATE_FAILUER]);
+					draw_string_vcenter(down_screen_addr, 36, 74, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_CREATION_FAILED]);
 					savestate_map[slot_index]= -savestate_map[slot_index];
 				}
 				else
 				{
-					draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_SAVESTATE_SUCCESS]);
+					draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED]);
 					savestate_index = slot_index;
 				}
 
@@ -2099,7 +2097,7 @@ u32 menu(u16 *screen)
 				if(fp == NULL)
 				{
 					draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
-					draw_string_vcenter(down_screen_addr, 36, 80, 190, COLOR_MSSG, msg[MSG_SAVESTATE_FILE_BAD]);
+					draw_string_vcenter(down_screen_addr, 36, 80, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_CORRUPTED]);
 					ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 
 					wait_Allkey_release(0);
@@ -2115,17 +2113,17 @@ u32 menu(u16 *screen)
 				if(gui_action == CURSOR_SELECT)
 				{
 					draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color); 
-					draw_string_vcenter(up_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_LOADSTATE_DOING]);
+					draw_string_vcenter(up_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_LOADING]);
 
 					int flag = load_state(tmp_filename);
 					if(0 == flag)
 					{
 						return_value = 1;
 						repeat = 0;
-						draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_LOADSTATE_SUCCESS]);
+						draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED]);
 					}
 					else
-						draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_LOADSTATE_FAILURE]);
+						draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_LOAD_FAILED]);
 				}
 				else	//load screen snapshot
 				{
@@ -2135,7 +2133,7 @@ u32 menu(u16 *screen)
 			else
 			{
 				ds2_clearScreen(UP_SCREEN, COLOR_BLACK);
-				draw_string_vcenter(up_screen_addr, 36, 75, 190, COLOR_WHITE, msg[MSG_SAVESTATE_SLOT_EMPTY]);
+				draw_string_vcenter(up_screen_addr, 36, 75, 190, COLOR_WHITE, msg[MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT]);
 				ds2_flipScreen(UP_SCREEN, 1);
 			}
 		}
@@ -2159,7 +2157,7 @@ u32 menu(u16 *screen)
 				u32 i, flag;
 
 				draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
-				draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_DELETTE_ALL_SAVESTATE_WARING]);
+				draw_string_vcenter(down_screen_addr, 36, 75, 190, COLOR_MSSG, msg[MSG_DIALOG_SAVED_STATE_DELETE_ALL]);
 
 				flag= 0;
 				for(i= 0; i < SAVE_STATE_SLOT_NUM; i++)
@@ -2185,7 +2183,7 @@ u32 menu(u16 *screen)
 				else
 				{
 					draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
-					draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_DELETTE_SAVESTATE_NOTHING]);
+					draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY]);
 					ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 					mdelay(500);
 				}
@@ -2196,7 +2194,7 @@ u32 menu(u16 *screen)
 
 				if(savestate_map[delette_savestate_num] > 0)
 				{
-					sprintf(line_buffer, msg[MSG_DELETTE_SINGLE_SAVESTATE_WARING], delette_savestate_num);
+					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)")) {
@@ -2206,7 +2204,7 @@ u32 menu(u16 *screen)
 				}
 				else
 				{
-					draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_DELETTE_SAVESTATE_NOTHING]);
+					draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY]);
 					ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 					mdelay(500);
 				}
@@ -2488,7 +2486,7 @@ u32 menu(u16 *screen)
 		PRINT_STRING_BG(down_screen_addr, line_buffer, color, COLOR_TRANS, CHEAT_NUMBER_X, 40 + display_option-> line_number*27);
 
 		if (i >= Cheat.num_cheats) {
-			PRINT_STRING_BG(down_screen_addr, msg[MSG_CHEAT_MENU_NON_LOAD], color, COLOR_TRANS, CHEAT_DESC_X, 40 + display_option-> line_number*27);
+			PRINT_STRING_BG(down_screen_addr, msg[MSG_CHEAT_ELEMENT_NOT_LOADED], color, COLOR_TRANS, CHEAT_DESC_X, 40 + display_option-> line_number*27);
 		}
 		else {
 			strcpy(line_buffer, Cheat.c[i].name);
@@ -2577,18 +2575,18 @@ u32 menu(u16 *screen)
             draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
             if(!first_load)
             {
-                draw_string_vcenter(down_screen_addr, 36, 70, 190, COLOR_MSSG, msg[MSG_SAVE_SNAPSHOT]);
+                draw_string_vcenter(down_screen_addr, 36, 70, 190, COLOR_MSSG, msg[MSG_PROGRESS_SCREENSHOT_CREATING]);
                 ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
                 if(save_ss_bmp(screen))
-                    draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_SAVE_SNAPSHOT_COMPLETE]);
+                    draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED]);
                 else
-                    draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_SAVE_SNAPSHOT_FAILURE]);
+                    draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_PROGRESS_SCREENSHOT_CREATION_FAILED]);
                 ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 				mdelay(500);
             }
             else
             {
-                draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_SAVESTATE_SLOT_EMPTY]);
+                draw_string_vcenter(down_screen_addr, 36, 90, 190, COLOR_MSSG, msg[MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT]);
                 ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 				mdelay(500);
             }
@@ -2601,94 +2599,6 @@ u32 menu(u16 *screen)
             play_screen_snapshot();
     }
 
-    void keyremap()
-    {
-        if(gui_action== CURSOR_RIGHT || gui_action== CURSOR_LEFT)
-        {
-//          if(current_option_num != 0)
-//              game_config.use_default_gamepad_map = 0;
-          switch(current_option_num)
-          {
-            case 1: //GBA KEY A
-                if(BUTTON_MAP_A == BUTTON_ID_A)
-                    BUTTON_MAP_A = BUTTON_ID_Y;
-                else if(BUTTON_MAP_A == BUTTON_ID_Y)
-                    BUTTON_MAP_A = BUTTON_ID_A;
-
-                BUTTON_MAP_FA = BUTTON_ID_NONE;
-                BUTTON_MAP_FB = BUTTON_ID_NONE;
-              break;
-            case 2: //GBA KEY B(fixed B)
-              break;
-            case 3: //GBA KEY FA(fixed X)
-                if(BUTTON_MAP_FA == BUTTON_ID_NONE)
-                {
-                   BUTTON_MAP_FA = BUTTON_ID_X;
-                }
-                else
-                   BUTTON_MAP_FA = BUTTON_ID_NONE;
-
-              break;
-            case 4: //GBA KEY FB
-                if(BUTTON_MAP_A == BUTTON_ID_A)
-                {
-                    if(BUTTON_MAP_FB == BUTTON_ID_Y)
-                        BUTTON_MAP_FB = BUTTON_ID_NONE;
-                    else
-                        BUTTON_MAP_FB = BUTTON_ID_Y;
-                }
-                else if(BUTTON_MAP_A == BUTTON_ID_Y)
-                {
-                    if(BUTTON_MAP_FB == BUTTON_ID_NONE)
-                        BUTTON_MAP_FB = BUTTON_ID_A;
-                    else
-                        BUTTON_MAP_FB = BUTTON_ID_NONE;
-                }
-              break;
-            case 5: //Awaking menu
-                if(BUTTON_MAP_MENU == BUTTON_ID_X)
-                {
-                    if(BUTTON_MAP_A != BUTTON_ID_Y && BUTTON_MAP_FB != BUTTON_ID_Y)
-                        BUTTON_MAP_MENU = BUTTON_ID_Y;
-                    else
-                        BUTTON_MAP_MENU = BUTTON_ID_TOUCH;
-                }
-                else if(BUTTON_MAP_MENU == BUTTON_ID_TOUCH)
-                {
-                    if(BUTTON_MAP_FA != BUTTON_ID_X)
-                        BUTTON_MAP_MENU = BUTTON_ID_X;
-                    else if(BUTTON_MAP_A != BUTTON_ID_Y && BUTTON_MAP_FB != BUTTON_ID_Y)
-                        BUTTON_MAP_MENU = BUTTON_ID_Y;
-                }
-                else
-                    BUTTON_MAP_MENU = BUTTON_ID_TOUCH;
-              break;
-            default:
-              break;
-          }
-        }
-
-        if(BUTTON_MAP_MENU == BUTTON_ID_X && BUTTON_MAP_FA == BUTTON_ID_X)
-        {
-            if(BUTTON_MAP_A == BUTTON_ID_Y || BUTTON_MAP_FB == BUTTON_ID_Y)
-                BUTTON_MAP_MENU = BUTTON_ID_TOUCH;
-            else
-                BUTTON_MAP_MENU = BUTTON_ID_Y;
-        }
-        else if(BUTTON_MAP_MENU == BUTTON_ID_Y)
-        {
-            if(BUTTON_MAP_A == BUTTON_ID_Y || BUTTON_MAP_FB == BUTTON_ID_Y)
-            {
-                if(BUTTON_MAP_FA == BUTTON_ID_X)
-                    BUTTON_MAP_MENU = BUTTON_ID_TOUCH;
-                else
-                    BUTTON_MAP_MENU = BUTTON_ID_X;
-            }
-        }
-
-//        gamepad_config_menu = BUTTON_MAP_MENU;
-    }
-
 	void time_backward_action()
 	{
 		tools_menu_init();
@@ -2739,13 +2649,13 @@ u32 menu(u16 *screen)
             bg_screenp_color = COLOR_BG;
 
         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_LOAD_DEFAULT_WARING]);
+        draw_string_vcenter(down_screen_addr, 36, 70, 190, COLOR_MSSG, msg[MSG_DIALOG_RESET]);
 
         if(draw_yesno_dialog(DOWN_SCREEN, 115, "Yes", "No"))
         {
 			wait_Allkey_release(0);
             draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
-            draw_string_vcenter(down_screen_addr, 36, 80, 190, COLOR_MSSG, msg[MSG_DEFAULT_LOADING]);
+            draw_string_vcenter(down_screen_addr, 36, 80, 190, COLOR_MSSG, msg[MSG_PROGRESS_RESETTING]);
             ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 
             sprintf(line_buffer, "%s/%s", main_path, EMU_CONFIG_FILENAME);
@@ -2756,7 +2666,7 @@ u32 menu(u16 *screen)
             init_game_config();
 
 			ds2_clearScreen(UP_SCREEN, 0);
-            draw_string_vcenter(up_screen_addr, 0, 80, 256, COLOR_WHITE, msg[MSG_NON_LOAD_GAME]);
+            draw_string_vcenter(up_screen_addr, 0, 80, 256, COLOR_WHITE, msg[MSG_TOP_SCREEN_NO_GAME_LOADED]);
 			ds2_flipScreen(UP_SCREEN, 1);
 
 			// mdelay(500); // Delete this delay
@@ -2774,8 +2684,8 @@ u32 menu(u16 *screen)
             bg_screenp_color = COLOR_BG;
 
         draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, bg_screenp_color);
-        draw_string_vcenter(down_screen_addr, 36, 80, 190, COLOR_MSSG, msg[MSG_EMU_VERSION0]);
-        sprintf(line_buffer, "%s %s", msg[MSG_EMU_VERSION1], NDSSFC_VERSION);
+        draw_string_vcenter(down_screen_addr, 36, 80, 190, COLOR_MSSG, msg[MSG_EMULATOR_NAME]);
+        sprintf(line_buffer, "%s %s", msg[MSG_WORD_EMULATOR_VERSION], NDSSFC_VERSION);
         draw_string_vcenter(down_screen_addr, 36, 95, 190, COLOR_MSSG, line_buffer);
         ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 
@@ -2786,6 +2696,7 @@ u32 menu(u16 *screen)
     {
         if(gui_action == CURSOR_LEFT || gui_action == CURSOR_RIGHT)
         {
+            ds2_setCPUclocklevel(13); // crank it up
             if(bg_screenp != NULL)
             {
                 bg_screenp_color = COLOR16(43, 11, 11);
@@ -2805,12 +2716,13 @@ u32 menu(u16 *screen)
             if(first_load)
             {
 				ds2_clearScreen(UP_SCREEN, 0);
-                draw_string_vcenter(up_screen_addr, 0, 80, 256, COLOR_WHITE, msg[MSG_NON_LOAD_GAME]);
+                draw_string_vcenter(up_screen_addr, 0, 80, 256, COLOR_WHITE, msg[MSG_TOP_SCREEN_NO_GAME_LOADED]);
 				ds2_flipScreen(UP_SCREEN, 1);
             }
 
-			save_emu_config_file();
-			wait_Allkey_release(0);
+            save_emu_config_file();
+            ds2_setCPUclocklevel(0); // and back down
+            wait_Allkey_release(0);
         }
     }
 
@@ -2858,43 +2770,36 @@ u32 menu(u16 *screen)
             40 + (display_option->line_number)*27);
     }
 
-    char *screen_ratio_options[] = { (char*)&msg[MSG_SCREEN_RATIO_0],
-									(char*)&msg[MSG_SCREEN_RATIO_1],
-									(char*)&msg[MSG_SCREEN_RATIO_2],
-									(char*)&msg[MSG_SCREEN_RATIO_3],
-									(char*)&msg[MSG_SCREEN_RATIO_4]};
+    char *screen_ratio_options[] = { (char*)&msg[MSG_VIDEO_ASPECT_RATIO_0],
+									(char*)&msg[MSG_VIDEO_ASPECT_RATIO_1],
+									(char*)&msg[MSG_VIDEO_ASPECT_RATIO_2],
+									(char*)&msg[MSG_VIDEO_ASPECT_RATIO_3],
+									(char*)&msg[MSG_VIDEO_ASPECT_RATIO_4]};
     
     char *frameskip_options[] = { (char*)&msg[MSG_FRAMESKIP_0], (char*)&msg[MSG_FRAMESKIP_1] };
 
     char *on_off_options[] = { (char*)&msg[MSG_ON_OFF_0], (char*)&msg[MSG_ON_OFF_1] };
 
-//    char *sound_seletion[] = { (char*)&msg[MSG_SOUND_SWITCH_0], (char*)&msg[MSG_SOUND_SWITCH_1] };
+    char *sound_seletion[] = { (char*)&msg[MSG_AUDIO_ENABLED], (char*)&msg[MSG_AUDIO_MUTED] };
 
 //    char *snap_frame_options[] = { (char*)&msg[MSG_SNAP_FRAME_0], (char*)&msg[MSG_SNAP_FRAME_1] };
 
     char *enable_disable_options[] = { (char*)&msg[MSG_EN_DIS_ABLE_0], (char*)&msg[MSG_EN_DIS_ABLE_1] };
 
-    char *keyremap_options[] = {(char*)&msg[MSG_KEY_MAP_NONE], (char*)&msg[MSG_KEY_MAP_A], (char*)&msg[MSG_KEY_MAP_B], 
-                                (char*)&msg[MSG_KEY_MAP_SL], (char*)&msg[MSG_KEY_MAP_ST], (char*)&msg[MSG_KEY_MAP_RT], 
-                                (char*)&msg[MSG_KEY_MAP_LF], (char*)&msg[MSG_KEY_MAP_UP], (char*)&msg[MSG_KEY_MAP_DW], 
-                                (char*)&msg[MSG_KEY_MAP_R], (char*)&msg[MSG_KEY_MAP_L], (char*)&msg[MSG_KEY_MAP_X], 
-                                (char*)&msg[MSG_KEY_MAP_Y], (char*)&msg[MSG_KEY_MAP_TOUCH]
-                                };
-
   /*--------------------------------------------------------
     Video & Audio
   --------------------------------------------------------*/
 	MENU_OPTION_TYPE graphics_options[] =
 	{
-	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_0], NULL, 0),
+	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_VIDEO_AUDIO], NULL, 0),
 
-    /* 01 */ STRING_SELECTION_OPTION(NULL, NULL, &msg[MSG_SUB_MENU_00], screen_ratio_options, 
+    /* 01 */ STRING_SELECTION_OPTION(NULL, NULL, &msg[FMT_VIDEO_ASPECT_RATIO], screen_ratio_options, 
         &game_config.graphic, 5, NULL, PASSIVE_TYPE, 1),
 
-	/* 02 */ STRING_SELECTION_OPTION(game_fastforward, NULL, &msg[MSG_SUB_MENU_01], on_off_options, 
+	/* 02 */ STRING_SELECTION_OPTION(game_fastforward, NULL, &msg[MSG_VIDEO_FAST_FORWARD], on_off_options, 
 		&game_fast_forward, 2, NULL, ACTION_TYPE, 2),
 		
-	/* 03 */	STRING_SELECTION_OPTION(game_disableAudio, NULL, &msg[MSG_SUB_MENU_04],on_off_options,
+	/* 03 */	STRING_SELECTION_OPTION(game_disableAudio, NULL, &msg[FMT_AUDIO_SOUND], sound_seletion,
 		&game_enable_audio, 2, NULL, ACTION_TYPE, 3)
 	};
 
@@ -2907,12 +2812,12 @@ u32 menu(u16 *screen)
 
 	MENU_OPTION_TYPE gamestate_delette_options[] =
 	{
-	/* 00 */ SUBMENU_OPTION(&game_state_menu, &msg[MSG_SUB_MENU_13], NULL, 0),
+	/* 00 */ SUBMENU_OPTION(&game_state_menu, &msg[MSG_SAVED_STATE_DELETE_GENERAL], NULL, 0),
 
-	/* 01 */ ACTION_OPTION(delette_savestate, NULL, &msg[MSG_SUB_MENU_130], NULL, 1),
+	/* 01 */ ACTION_OPTION(delette_savestate, NULL, &msg[MSG_SAVED_STATE_DELETE_ALL], NULL, 1),
 
 	/* 02 */ NUMERIC_SELECTION_ACTION_OPTION(delette_savestate, NULL,
-		&msg[MSG_SUB_MENU_131], &delette_savestate_num, 10, NULL, 2)
+		&msg[FMT_SAVED_STATE_DELETE_ONE], &delette_savestate_num, 10, NULL, 2)
 	};
 
 	MAKE_MENU(gamestate_delette, NULL, gamestate_delette_menu_passive, NULL, NULL, 0, 0);
@@ -2922,14 +2827,14 @@ u32 menu(u16 *screen)
   --------------------------------------------------------*/
 	MENU_OPTION_TYPE game_state_options[] =
 	{
-	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_1], NULL, 0),
+	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_SAVED_STATES], NULL, 0),
 
-	/* 01 */ ACTION_OPTION(menu_save_state, NULL, &msg[MSG_SUB_MENU_10], NULL, 1),
+	/* 01 */ ACTION_OPTION(menu_save_state, NULL, &msg[MSG_SAVED_STATE_CREATE], NULL, 1),
 
 	/* 02 */ NUMERIC_SELECTION_ACTION_OPTION(menu_load_state, NULL,
-        &msg[MSG_SUB_MENU_11], &savestate_index, 10, NULL, 2),
+        &msg[FMT_SAVED_STATE_LOAD], &savestate_index, 10, NULL, 2),
 
-	/* 03 */ SUBMENU_OPTION(&gamestate_delette_menu, &msg[MSG_SUB_MENU_13], NULL, 5),
+	/* 03 */ SUBMENU_OPTION(&gamestate_delette_menu, &msg[MSG_SAVED_STATE_DELETE_GENERAL], NULL, 5),
 	};
 
 	INIT_MENU(game_state, NULL, game_state_menu_passive, NULL, NULL, 0, 0);
@@ -2939,7 +2844,7 @@ u32 menu(u16 *screen)
   --------------------------------------------------------*/
 	MENU_OPTION_TYPE cheats_options[] =
 	{
-	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_2], NULL,0),
+	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_CHEATS], NULL,0),
 
 	/* 01 */ CHEAT_OPTION(cheat_option_action, cheat_option_passive, 
 		((CHEATS_PER_PAGE * menu_cheat_page) + 0), 1),
@@ -2950,10 +2855,10 @@ u32 menu(u16 *screen)
 	/* 04 */ CHEAT_OPTION(cheat_option_action, cheat_option_passive,
 		((CHEATS_PER_PAGE * menu_cheat_page) + 3), 4),
 
-	/* 05 */ NUMERIC_SELECTION_ACTION_OPTION(reload_cheats_page, NULL, &msg[MSG_SUB_MENU_20],
+	/* 05 */ NUMERIC_SELECTION_ACTION_OPTION(reload_cheats_page, NULL, &msg[FMT_CHEAT_PAGE],
         &menu_cheat_page, MAX_CHEATS_PAGE, NULL, 5),
 
-	/* 06 */ ACTION_OPTION(menu_load_cheat_file, NULL, &msg[MSG_SUB_MENU_21],
+	/* 06 */ ACTION_OPTION(menu_load_cheat_file, NULL, &msg[MSG_CHEAT_LOAD_FROM_FILE],
         NULL, 6)
 	};
 
@@ -2966,51 +2871,26 @@ u32 menu(u16 *screen)
 
     MENU_OPTION_TYPE tools_screensnap_options[] =
     {
-	/* 00 */ SUBMENU_OPTION(&tools_menu, &msg[MSG_SUB_MENU_30], NULL, 0),
+	/* 00 */ SUBMENU_OPTION(&tools_menu, &msg[MSG_TOOLS_SCREENSHOT_GENERAL], NULL, 0),
 
-	/* 01 */ ACTION_OPTION(save_screen_snapshot, NULL, &msg[MSG_SUB_MENU_300], NULL, 1),
+	/* 01 */ ACTION_OPTION(save_screen_snapshot, NULL, &msg[MSG_SCREENSHOT_CREATE], NULL, 1),
 
-	/* 02 */ ACTION_OPTION(browse_screen_snapshot, NULL, &msg[MSG_SUB_MENU_301], NULL, 2)
+	/* 02 */ ACTION_OPTION(browse_screen_snapshot, NULL, &msg[MSG_SCREENSHOT_BROWSE], NULL, 2)
     };
 
     MAKE_MENU(tools_screensnap, NULL, NULL, NULL, NULL, 0, 0);
-
-  /*--------------------------------------------------------
-     Tools-keyremap
-  --------------------------------------------------------*/
-    MENU_OPTION_TYPE tools_keyremap_options[] = 
-    {
-	/* 00 */ SUBMENU_OPTION(&tools_menu, &msg[MSG_SUB_MENU_31], NULL, 0),
-        
-	/* 01 */ STRING_SELECTION_OPTION(keyremap, keyremap_show, &msg[MSG_SUB_MENU_310], 
-		NULL, &string_select, 2, NULL, ACTION_TYPE, 1),
-        
-	/* 02 */ STRING_SELECTION_OPTION(keyremap, keyremap_show, &msg[MSG_SUB_MENU_311], 
-		NULL, &string_select, 1, NULL, ACTION_TYPE | HIDEN_TYPE, 2),
-        
-	/* 03 */ STRING_SELECTION_OPTION(keyremap, keyremap_show, &msg[MSG_SUB_MENU_312], 
-		NULL, &string_select, 2, NULL, ACTION_TYPE, 3),
-        
-	/* 04 */ STRING_SELECTION_OPTION(keyremap, keyremap_show, &msg[MSG_SUB_MENU_313], 
-		NULL, &string_select, 3, NULL, ACTION_TYPE, 4),
-        
-	/* 05 */ STRING_SELECTION_OPTION(keyremap, keyremap_show, &msg[MSG_SUB_MENU_314], 
-		NULL, &string_select, 3, NULL, ACTION_TYPE, 5)
-    };
-
-    MAKE_MENU(tools_keyremap, NULL, NULL, NULL, NULL, 0, 0);
   /*--------------------------------------------------------
      Tools
   --------------------------------------------------------*/
     MENU_OPTION_TYPE tools_options[] = 
     {
-	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_3], NULL, 0),
+	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_TOOLS], NULL, 0),
 
-	/* 01 */ SUBMENU_OPTION(&tools_screensnap_menu, &msg[MSG_SUB_MENU_30], NULL, 1),
+	/* 01 */ SUBMENU_OPTION(&tools_screensnap_menu, &msg[MSG_TOOLS_SCREENSHOT_GENERAL], NULL, 1),
 
 //	/* 02 */ SUBMENU_OPTION(&tools_keyremap_menu, &msg[MSG_SUB_MENU_31], NULL, 2),
 
-//	/* 03 */ STRING_SELECTION_OPTION(time_backward_action, NULL, &msg[MSG_SUB_MENU_302], enable_disable_options, 
+//	/* 03 */ STRING_SELECTION_OPTION(time_backward_action, NULL, &msg[MSG_SUB_MENU_302], on_off_options, 
 //			&game_config.backward, 2, NULL, ACTION_TYPE, 3),
 
 //	/* 04 */ NUMERIC_SELECTION_ACTION_OPTION(time_period_action, time_period_passive, &msg[MSG_SUB_MENU_32], 
@@ -3025,20 +2905,20 @@ u32 menu(u16 *screen)
     u32 desert= 0;
 	MENU_OPTION_TYPE others_options[] = 
 	{
-	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_4], NULL, 0),
+	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_MAIN_MENU_OPTIONS], NULL, 0),
 
 	//CPU speed
-	/* 01 */ NUMERIC_SELECTION_OPTION(NULL, &msg[MSG_SUB_MENU_42], &clock_speed_number, 6, NULL, 1),
+	/* 01 */ NUMERIC_SELECTION_OPTION(NULL, &msg[FMT_OPTIONS_CPU_FREQUENCY], &clock_speed_number, 6, NULL, 1),
 
-	/* 02 */ STRING_SELECTION_OPTION(language_set, NULL, &msg[MSG_SUB_MENU_41], language_options, 
+	/* 02 */ STRING_SELECTION_OPTION(language_set, NULL, &msg[FMT_OPTIONS_LANGUAGE], language_options, 
         &emu_config.language, sizeof(language_options) / sizeof(language_options[0]) /* number of possible languages */, NULL, ACTION_TYPE, 2),
 
-	/* 03 */ STRING_SELECTION_OPTION(NULL, show_card_space, &msg[MSG_SUB_MENU_43], NULL, 
+	/* 03 */ STRING_SELECTION_OPTION(NULL, show_card_space, &msg[MSG_OPTIONS_CARD_CAPACITY], NULL, 
         &desert, 2, NULL, PASSIVE_TYPE | HIDEN_TYPE, 3),
 
-	/* 04 */ ACTION_OPTION(load_default_setting, NULL, &msg[MSG_SUB_MENU_44], NULL, 4),
+	/* 04 */ ACTION_OPTION(load_default_setting, NULL, &msg[MSG_OPTIONS_RESET], NULL, 4),
 
-	/* 05 */ ACTION_OPTION(check_gbaemu_version, NULL, &msg[MSG_SUB_MENU_45], NULL, 5),
+	/* 05 */ ACTION_OPTION(check_gbaemu_version, NULL, &msg[MSG_OPTIONS_VERSION], NULL, 5),
 	};
 
 	MAKE_MENU(others, others_menu_init, NULL, NULL, NULL, 1, 1);
@@ -3050,11 +2930,11 @@ u32 menu(u16 *screen)
   
     MENU_OPTION_TYPE load_game_options[] =
     {
-	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_SUB_MENU_62], NULL, 0),
+	/* 00 */ SUBMENU_OPTION(NULL, &msg[MSG_LOAD_GAME_MENU_TITLE], NULL, 0),
 
-	/* 01 */ ACTION_OPTION(menu_load, NULL, &msg[MSG_SUB_MENU_61], NULL, 1),
+	/* 01 */ ACTION_OPTION(menu_load, NULL, &msg[MSG_LOAD_GAME_FROM_CARD], NULL, 1),
 
-	/* 02 */ SUBMENU_OPTION(&latest_game_menu, &msg[MSG_SUB_MENU_60], NULL, 2)
+	/* 02 */ SUBMENU_OPTION(&latest_game_menu, &msg[MSG_LOAD_GAME_RECENTLY_PLAYED], NULL, 2)
     };
 
     MAKE_MENU(load_game, NULL, NULL, NULL, NULL, 1, 1);
@@ -3064,7 +2944,7 @@ u32 menu(u16 *screen)
   --------------------------------------------------------*/
     MENU_OPTION_TYPE latest_game_options[] =
     {
-	/* 00 */ SUBMENU_OPTION(&load_game_menu, &msg[MSG_SUB_MENU_60], NULL, 0),
+	/* 00 */ SUBMENU_OPTION(&load_game_menu, &msg[MSG_LOAD_GAME_RECENTLY_PLAYED], NULL, 0),
 
 	/* 01 */ ACTION_OPTION(load_lastest_played, NULL, NULL, NULL, 1),
 
@@ -3085,17 +2965,17 @@ u32 menu(u16 *screen)
   --------------------------------------------------------*/
 	MENU_OPTION_TYPE main_options[] =
 	{
-    /* 00 */ SUBMENU_OPTION(&graphics_menu, &msg[MSG_MAIN_MENU_0], NULL, 0),
+    /* 00 */ SUBMENU_OPTION(&graphics_menu, &msg[MSG_MAIN_MENU_VIDEO_AUDIO], NULL, 0),
 
-    /* 01 */ SUBMENU_OPTION(&game_state_menu, &msg[MSG_MAIN_MENU_1], NULL, 1),
+    /* 01 */ SUBMENU_OPTION(&game_state_menu, &msg[MSG_MAIN_MENU_SAVED_STATES], NULL, 1),
 
-    /* 02 */ SUBMENU_OPTION(&cheats_menu, &msg[MSG_MAIN_MENU_2], NULL, 2),
+    /* 02 */ SUBMENU_OPTION(&cheats_menu, &msg[MSG_MAIN_MENU_CHEATS], NULL, 2),
 
-    /* 03 */ SUBMENU_OPTION(&tools_menu, &msg[MSG_MAIN_MENU_3], NULL, 3),
+    /* 03 */ SUBMENU_OPTION(&tools_menu, &msg[MSG_MAIN_MENU_TOOLS], NULL, 3),
 
-    /* 04 */ SUBMENU_OPTION(&others_menu, &msg[MSG_MAIN_MENU_4], NULL, 4),
+    /* 04 */ SUBMENU_OPTION(&others_menu, &msg[MSG_MAIN_MENU_OPTIONS], NULL, 4),
 
-    /* 05 */ ACTION_OPTION(menu_exit, NULL, &msg[MSG_MAIN_MENU_5], NULL, 5),
+    /* 05 */ ACTION_OPTION(menu_exit, NULL, &msg[MSG_MAIN_MENU_EXIT], NULL, 5),
 
     /* 06 */ SUBMENU_OPTION(&load_game_menu, NULL, NULL, 6),
 
@@ -3404,7 +3284,7 @@ u32 menu(u16 *screen)
 		char *ext_pos;
 
 		draw_message(down_screen_addr, bg_screenp, 28, 31, 227, 165, 0);
-		draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_LOADING_GAME]);
+		draw_string_vcenter(down_screen_addr, 36, 100, 190, COLOR_MSSG, msg[MSG_PROGRESS_LOADING_GAME]);
 		ds2_flipScreen(DOWN_SCREEN, DOWN_SCREEN_UPDATE_METHOD);
 
 		if(gamepak_name[0] != 0)
@@ -3458,40 +3338,6 @@ u32 menu(u16 *screen)
 		repeat = 0;
     }
 
-    void keyremap_show()
-    {
-        unsigned short color;
-        u32 line_num;
-        u32 index;
-
-        if(display_option->option_type & STRING_SELECTION_TYPE)
-        {
-            switch(i+1)
-            {
-                case 1: index= BUTTON_MAP_A; break;
-                case 2: index= BUTTON_MAP_B; break;
-                case 3: index= BUTTON_MAP_FA; break;
-                case 4: index= BUTTON_MAP_FB; break;
-                case 5: index= BUTTON_MAP_MENU; break;
-                default: index= 0; break;
-            }
-
-            line_num= 0;
-            while(index) {index >>= 1; line_num++;}
-            sprintf(line_buffer, *(display_option->display_string), *((u32*)keyremap_options[line_num]));
-        }
-        else
-            strcpy(line_buffer, *(display_option->display_string));
-    
-        line_num= display_option-> line_number;
-        if(display_option == current_option)
-            color= COLOR_ACTIVE_ITEM;
-        else
-            color= COLOR_INACTIVE_ITEM;
-    
-        PRINT_STRING_BG(down_screen_addr, line_buffer, color, COLOR_TRANS, 26, 37 + line_num*32);
-    }
-
     void game_fastforward()
     {
     }
@@ -3553,7 +3399,7 @@ u32 menu(u16 *screen)
 		else
 		{
 			ds2_clearScreen(UP_SCREEN, COLOR_BLACK);
-			draw_string_vcenter(up_screen_addr, 0, 80, 256, COLOR_WHITE, msg[MSG_NON_LOAD_GAME]);
+			draw_string_vcenter(up_screen_addr, 0, 80, 256, COLOR_WHITE, msg[MSG_TOP_SCREEN_NO_GAME_LOADED]);
 			ds2_flipScreen(UP_SCREEN, 1);
 		}
 	}
@@ -4022,116 +3868,114 @@ void initial_path_config(void)
 --------------------------------------------------------*/
 int load_language_msg(char *filename, u32 language)
 {
-    FILE *fp;
-    char msg_path[MAX_PATH];
-    char string[256];
-    char start[32];
-    char end[32];
-    char *pt, *dst;
-    u32 cmplen;
-    u32 loop, offset, len;
-    int ret;
-
-    sprintf(msg_path, "%s/%s", main_path, filename);
-    fp = fopen(msg_path, "rb");
-    if(fp == NULL)
-        return -1;
-
-    switch(language)
-    {
-    case ENGLISH:
+	FILE *fp;
+	char msg_path[MAX_PATH];
+	char string[256];
+	char start[32];
+	char end[32];
+	char *pt, *dst;
+	u32 loop, offset, len;
+	int ret;
+
+	sprintf(msg_path, "%s/%s", main_path, filename);
+	fp = fopen(msg_path, "rb");
+	if(fp == NULL)
+	return -1;
+
+	switch(language)
+	{
+	case ENGLISH:
 	default:
-        strcpy(start, "STARTENGLISH");
-        strcpy(end, "ENDENGLISH");
-        cmplen= 12;
-        break;
-    case CHINESE_SIMPLIFIED:
-        strcpy(start, "STARTCHINESESIM");
-        strcpy(end, "ENDCHINESESIM");
-        cmplen= 15;
-        break;
+		strcpy(start, "STARTENGLISH");
+		strcpy(end, "ENDENGLISH");
+		break;
+	case CHINESE_SIMPLIFIED:
+		strcpy(start, "STARTCHINESESIM");
+		strcpy(end, "ENDCHINESESIM");
+		break;
 	case FRENCH:
-        strcpy(start, "STARTFRENCH");
-        strcpy(end, "ENDFRENCH");
-        cmplen= 11;
-        break;
-    }
-    //find the start flag
-    ret= 0;
-    while(1)
-    {
-        pt= fgets(string, 256, fp);
-        if(pt == NULL)
-        {
-            ret= -2;
-            goto load_language_msg_error;
-        }
+		strcpy(start, "STARTFRENCH");
+		strcpy(end, "ENDFRENCH");
+		break;
+	}
+	u32 cmplen = strlen(start);
 
-        if(!strncmp(pt, start, cmplen))
-            break;
-    }
+	//find the start flag
+	ret= 0;
+	while(1)
+	{
+		pt= fgets(string, 256, fp);
+		if(pt == NULL)
+		{
+			ret= -2;
+			goto load_language_msg_error;
+		}
 
-    loop= 0;
-    offset= 0;
-    dst= msg_data;
-    msg[0]= dst;
+		if(!strncmp(pt, start, cmplen))
+			break;
+	}
 
-    while(loop != MSG_END)
-    {
-        while(1)
-        {
-            pt = fgets(string, 256, fp);
-            if(pt[0] == '#' || pt[0] == 0x0D || pt[0] == 0x0A)
-                continue;
-            if(pt != NULL)
-                break;
-            else
-            {
-                ret = -3;
-                goto load_language_msg_error;
-            }
-        }
+	loop= 0;
+	offset= 0;
+	dst= msg_data;
+	msg[0]= dst;
 
-        if(!strncmp(pt, end, cmplen-2))
-            break;
+	while(loop != MSG_END)
+	{
+		while(1)
+		{
+			pt = fgets(string, 256, fp);
+			if(pt[0] == '#' || pt[0] == 0x0D || pt[0] == 0x0A)
+				continue;
+			if(pt != NULL)
+				break;
+			else
+			{
+				ret = -3;
+				goto load_language_msg_error;
+			}
+		}
 
-        len= strlen(pt);
-        memcpy(dst, pt, len);
+		if(!strncmp(pt, end, cmplen-2))
+			break;
 
-        dst += len;
-        //at a line return, when "\n" paded, this message not end
-        if(*(dst-1) == 0x0A)
-        {
-            pt = strrchr(pt, '\\');
-            if((pt != NULL) && (*(pt+1) == 'n'))
-            {
-                if(*(dst-2) == 0x0D)
-                {
-                    *(dst-4)= '\n';
-                    dst -= 3;
-                }
-                else
-                {
-                    *(dst-3)= '\n';
-                    dst -= 2;
-                }
-            }
-            else//a message end
-            {
-                if(*(dst-2) == 0x0D)
-                    dst -= 1;
-                *(dst-1) = '\0';
-                msg[++loop] = dst;
-            }
-        }
-    }
+		len= strlen(pt);
+		memcpy(dst, pt, len);
 
-#if 0
+		dst += len;
+		//at a line return, when "\n" paded, this message not end
+		if(*(dst-1) == 0x0A)
+		{
+			pt = strrchr(pt, '\\');
+			if((pt != NULL) && (*(pt+1) == 'n'))
+			{
+				if(*(dst-2) == 0x0D)
+				{
+					*(dst-4)= '\n';
+					dst -= 3;
+				}
+				else
+				{
+					*(dst-3)= '\n';
+					dst -= 2;
+				}
+			}
+			else//a message end
+			{
+				if(*(dst-2) == 0x0D)
+				dst -= 1;
+				*(dst-1) = '\0';
+				msg[++loop] = dst;
+			}
+		}
+	}
+
+	#if 0
 	loop= 0;
 	printf("------\n");
 	while(loop != MSG_END)
-		printf("%d: %s\n",loop, msg[loop++]);
-#endif
+	printf("%d: %s\n",loop, msg[loop++]);
+	#endif
 
 load_language_msg_error:
 	fclose(fp);
diff --git a/source/nds/message.h b/source/nds/message.h
index 4a0acd2..40b34f6 100644
--- a/source/nds/message.h
+++ b/source/nds/message.h
@@ -22,149 +22,149 @@
 
 enum MSG
 {
-    MSG_MAIN_MENU_0,    /* 0 */
-    MSG_MAIN_MENU_1,    /* 1 */
-    MSG_MAIN_MENU_2,    /* 2 */
-    MSG_MAIN_MENU_3,    /* 3 */
-    MSG_MAIN_MENU_4,    /* 4 */
-    MSG_MAIN_MENU_5,    /* 5 */
-    MSG_SUB_MENU_00,    /* 6 */
-    MSG_SUB_MENU_01,    /* 7 */
-    MSG_SUB_MENU_02,    /* 8 */
-    MSG_SUB_MENU_03,    /* 9 */
-    MSG_SUB_MENU_04,    /* 10 */
-    MSG_SUB_MENU_05,    /* 11 */
-    MSG_SUB_MENU_10,    /* 12 */
-    MSG_SUB_MENU_11,    /* 13 */
-    MSG_SUB_MENU_12,    /* 14 */
-    MSG_SUB_MENU_13,    /* 15 */
-    MSG_SUB_MENU_14,    /* 16 */
-    MSG_SUB_MENU_20,    /* 17 */
-    MSG_SUB_MENU_21,    /* 18 */
-    MSG_SUB_MENU_22,    /* 19 */
-    MSG_SUB_MENU_23,    /* 20 */
-    MSG_SUB_MENU_24,    /* 21 */
-    MSG_SUB_MENU_30,    /* 22 */
-    MSG_SUB_MENU_31,    /* 23 */
-    MSG_SUB_MENU_32,    /* 24 */
-    MSG_SUB_MENU_40,    /* 25 */
-    MSG_SUB_MENU_41,    /* 26 */
-    MSG_SUB_MENU_42,    /* 27 */
-    MSG_SUB_MENU_43,    /* 28 */
-    MSG_SUB_MENU_44,    /* 29 */
-    MSG_SUB_MENU_45,    /* 30 */
-    MSG_SUB_MENU_300,   /* 31 */
-    MSG_SUB_MENU_301,   /* 32 */
-    MSG_SUB_MENU_302,   /* 33 */
-    MSG_SUB_MENU_310,   /* 34 */
-    MSG_SUB_MENU_311,   /* 35 */
-    MSG_SUB_MENU_312,   /* 36 */
-    MSG_SUB_MENU_313,   /* 37 */
-    MSG_SUB_MENU_314,   /* 38 */
-    MSG_SUB_MENU_315,   /* 39 */
-    MSG_SUB_MENU_60,    /* 40 */
-    MSG_SUB_MENU_61,    /* 41 */
-    MSG_SUB_MENU_62,    /* 42 */
-
-    MSG_SCREEN_RATIO_0,
-    MSG_SCREEN_RATIO_1,
-    MSG_SCREEN_RATIO_2,
-    MSG_SCREEN_RATIO_3,
-	MSG_SCREEN_RATIO_4,
-
-    MSG_FRAMESKIP_0,    /* 45 */
-    MSG_FRAMESKIP_1,    /* 46 */
-
-    MSG_ON_OFF_0,       /* 47 */
-    MSG_ON_OFF_1,       /* 48 */
-    
-    MSG_SOUND_SWITCH_0, /* 49 */
-    MSG_SOUND_SWITCH_1, /* 50 */
-
-    MSG_SNAP_FRAME_0,   /* 51 */
-    MSG_SNAP_FRAME_1,   /* 52 */
-
-    MSG_EN_DIS_ABLE_0,  /* 53 */
-    MSG_EN_DIS_ABLE_1,  /* 54 */
-
-    MSG_NON_LOAD_GAME,  /* 55 */
-    MSG_CHEAT_MENU_NON_LOAD,/* 56 */
-    MSG_CHEAT_MENU_LOADED,   /* 57 */
-
-    MSG_LOAD_STATE,     /* 58 */
-    MSG_LOAD_STATE_END, /* 59 */
-    MSG_SAVE_STATE,     /* 60 */
-    MSG_SAVE_STATE_END, /* 61 */
-
-    MSG_KEY_MAP_NONE,   /* 62 */
-    MSG_KEY_MAP_A,      /* 63 */
-    MSG_KEY_MAP_B,      /* 64 */
-    MSG_KEY_MAP_SL,     /* 65 */
-    MSG_KEY_MAP_ST,     /* 66 */
-    MSG_KEY_MAP_RT,     /* 67 */
-    MSG_KEY_MAP_LF,     /* 68 */
-    MSG_KEY_MAP_UP,     /* 69 */
-    MSG_KEY_MAP_DW,     /* 70 */
-    MSG_KEY_MAP_R,      /* 71 */
-    MSG_KEY_MAP_L,      /* 72 */
-    MSG_KEY_MAP_X,      /* 73 */
-    MSG_KEY_MAP_Y,      /* 74 */
-    MSG_KEY_MAP_TOUCH,  /* 75 */
-
-    MSG_SAVESTATE_EMPTY,/* 76 */
-    MSG_SAVESTATE_FULL, /* 77 */
-    MSG_SAVESTATE_DOING,/* 78 */
-    MSG_SAVESTATE_FAILUER,/* 79 */
-    MSG_SAVESTATE_SUCCESS,/* 80 */
-    MSG_SAVESTATE_SLOT_EMPTY,/* 81 */
-    MSG_SAVESTATE_FILE_BAD, /* 82 */
-    MSG_LOADSTATE_DOING,/* 83 */
-    MSG_LOADSTATE_FAILURE,/* 84 */
-    MSG_LOADSTATE_SUCCESS,/* 85 */
-
-    MSG_WARING_DIALOG,  /* 86 */
-    MSG_TIME_FORMATE,   /* 87 */
-
-    MSG_SUB_MENU_130,   /* 88 */
-    MSG_SUB_MENU_131,   /* 89 */
-
-    MSG_DELETTE_ALL_SAVESTATE_WARING,
-    MSG_DELETTE_SINGLE_SAVESTATE_WARING,
-    MSG_DELETTE_SAVESTATE_NOTHING,
-
-    MSG_SAVE_SNAPSHOT,
-    MSG_SAVE_SNAPSHOT_COMPLETE,
-    MSG_SAVE_SNAPSHOT_FAILURE,
-
-    MSG_CHANGE_LANGUAGE,
-    MSG_CHANGE_LANGUAGE_WAITING,
-
-    MSG_NO_SLIDE,
-    MSG_PLAYING_SLIDE,
-    MSG_PAUSE_SLIDE,
-    MSG_PLAY_SLIDE1,
-    MSG_PLAY_SLIDE2,
-    MSG_PLAY_SLIDE3,
-    MSG_PLAY_SLIDE4,
-    MSG_PLAY_SLIDE5,
-    MSG_PLAY_SLIDE6,
-    
-    MSG_LOADING_GAME,
-
-    MSG_EMU_VERSION0,
-    MSG_EMU_VERSION1,
-
-    MSG_LOAD_DEFAULT_WARING,
-    MSG_DEFAULT_LOADING,
-
-    MSG_BACK,
-
-    MSG_END
+	MSG_MAIN_MENU_VIDEO_AUDIO,
+	MSG_MAIN_MENU_SAVED_STATES,
+	MSG_MAIN_MENU_CHEATS,
+	MSG_MAIN_MENU_TOOLS,
+	MSG_MAIN_MENU_OPTIONS,
+	MSG_MAIN_MENU_EXIT,
+	FMT_VIDEO_ASPECT_RATIO,
+	MSG_VIDEO_FAST_FORWARD,
+	FMT_VIDEO_FRAME_SKIP_AUTOMATIC,
+	FMT_VIDEO_FRAME_SKIP_MANUAL,
+	FMT_AUDIO_SOUND,
+	MSG_SUB_MENU_05,                  // unused
+	MSG_SAVED_STATE_CREATE,
+	FMT_SAVED_STATE_LOAD,
+	MSG_SUB_MENU_12,                  // unused
+	MSG_SAVED_STATE_DELETE_GENERAL,
+	MSG_SUB_MENU_14,                  // unused
+	FMT_CHEAT_PAGE,
+	MSG_CHEAT_LOAD_FROM_FILE,
+	MSG_SUB_MENU_22,                  // unused
+	MSG_SUB_MENU_23,                  // unused
+	MSG_SUB_MENU_24,                  // unused
+	MSG_TOOLS_SCREENSHOT_GENERAL,
+	MSG_SUB_MENU_31,                  // unused
+	MSG_SUB_MENU_32,                  // unused
+	MSG_SUB_MENU_40,                  // unused
+	FMT_OPTIONS_LANGUAGE,
+	FMT_OPTIONS_CPU_FREQUENCY,
+	MSG_OPTIONS_CARD_CAPACITY,
+	MSG_OPTIONS_RESET,
+	MSG_OPTIONS_VERSION,
+	MSG_SCREENSHOT_CREATE,
+	MSG_SCREENSHOT_BROWSE,
+	MSG_SUB_MENU_302,                 // unused
+	MSG_SUB_MENU_310,                 // unused
+	MSG_SUB_MENU_311,                 // unused
+	MSG_SUB_MENU_312,                 // unused
+	MSG_SUB_MENU_313,                 // unused
+	MSG_SUB_MENU_314,                 // unused
+	MSG_SUB_MENU_315,                 // unused
+	MSG_LOAD_GAME_RECENTLY_PLAYED,
+	MSG_LOAD_GAME_FROM_CARD,
+	MSG_LOAD_GAME_MENU_TITLE,
+
+	MSG_VIDEO_ASPECT_RATIO_0,
+	MSG_VIDEO_ASPECT_RATIO_1,
+	MSG_VIDEO_ASPECT_RATIO_2,
+	MSG_VIDEO_ASPECT_RATIO_3,
+	MSG_VIDEO_ASPECT_RATIO_4,
+
+	MSG_FRAMESKIP_0,                  // unused
+	MSG_FRAMESKIP_1,                  // unused
+
+	MSG_ON_OFF_0,
+	MSG_ON_OFF_1,
+
+	MSG_AUDIO_ENABLED,
+	MSG_AUDIO_MUTED,
+
+	MSG_SNAP_FRAME_0,                 // unused
+	MSG_SNAP_FRAME_1,                 // unused
+
+	MSG_EN_DIS_ABLE_0,                // unused
+	MSG_EN_DIS_ABLE_1,                // unused
+
+	MSG_TOP_SCREEN_NO_GAME_LOADED,
+	MSG_CHEAT_ELEMENT_NOT_LOADED,
+	MSG_CHEAT_MENU_LOADED,            // unused
+
+	MSG_LOAD_STATE,                   // unused
+	MSG_LOAD_STATE_END,               // unused
+	MSG_SAVE_STATE,                   // unused
+	MSG_SAVE_STATE_END,               // unused
+
+	MSG_KEY_MAP_NONE,                 // unused
+	MSG_KEY_MAP_A,                    // unused
+	MSG_KEY_MAP_B,                    // unused
+	MSG_KEY_MAP_SL,                   // unused
+	MSG_KEY_MAP_ST,                   // unused
+	MSG_KEY_MAP_RT,                   // unused
+	MSG_KEY_MAP_LF,                   // unused
+	MSG_KEY_MAP_UP,                   // unused
+	MSG_KEY_MAP_DW,                   // unused
+	MSG_KEY_MAP_R,                    // unused
+	MSG_KEY_MAP_L,                    // unused
+	MSG_KEY_MAP_X,                    // unused
+	MSG_KEY_MAP_Y,                    // unused
+	MSG_KEY_MAP_TOUCH,                // unused
+
+	MSG_SAVESTATE_EMPTY,              // unused
+	MSG_SAVESTATE_FULL,
+	MSG_PROGRESS_SAVED_STATE_CREATING,
+	MSG_PROGRESS_SAVED_STATE_CREATION_FAILED,
+	MSG_PROGRESS_SAVED_STATE_CREATION_SUCCEEDED,
+	MSG_TOP_SCREEN_NO_SAVED_STATE_IN_SLOT,
+	MSG_PROGRESS_SAVED_STATE_CORRUPTED,
+	MSG_PROGRESS_SAVED_STATE_LOADING,
+	MSG_PROGRESS_SAVED_STATE_LOAD_FAILED,
+	MSG_PROGRESS_SAVED_STATE_LOAD_SUCCEEDED,
+
+	MSG_WARING_DIALOG,                // unused
+	MSG_TIME_FORMATE,                 // unused
+
+	MSG_SAVED_STATE_DELETE_ALL,
+	FMT_SAVED_STATE_DELETE_ONE,
+
+	MSG_DIALOG_SAVED_STATE_DELETE_ALL,
+	FMT_DIALOG_SAVED_STATE_DELETE_ONE,
+	MSG_PROGRESS_SAVED_STATE_ALREADY_EMPTY,
+
+	MSG_PROGRESS_SCREENSHOT_CREATING,
+	MSG_PROGRESS_SCREENSHOT_CREATION_SUCCEEDED,
+	MSG_PROGRESS_SCREENSHOT_CREATION_FAILED,
+
+	MSG_CHANGE_LANGUAGE,
+	MSG_CHANGE_LANGUAGE_WAITING,
+
+	MSG_NO_SLIDE,
+	MSG_PLAYING_SLIDE,
+	MSG_PAUSE_SLIDE,
+	MSG_PLAY_SLIDE1,
+	MSG_PLAY_SLIDE2,
+	MSG_PLAY_SLIDE3,
+	MSG_PLAY_SLIDE4,
+	MSG_PLAY_SLIDE5,
+	MSG_PLAY_SLIDE6,
+
+	MSG_PROGRESS_LOADING_GAME,
+
+	MSG_EMULATOR_NAME,
+	MSG_WORD_EMULATOR_VERSION,
+
+	MSG_DIALOG_RESET,
+	MSG_PROGRESS_RESETTING,
+
+	MSG_BACK,                        // unused
+
+	MSG_END
 };
 
-enum LANGUAGE{
-    ENGLISH,
-    CHINESE_SIMPLIFIED,
+enum LANGUAGE {
+	ENGLISH,
+	CHINESE_SIMPLIFIED,
 	FRENCH
 };