v1.2.2

might-and-magic · Feb 20, 2020 · d55a334 · d55a334
1 parent 3347fb5
commit d55a334
Show file tree

Hide file tree

Showing 923 changed files with 198 additions and 80 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,8 @@
 *.baiduyun.uploading.cfg
 
 
+# === Python.gitignore ===
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -138,3 +140,26 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+
+# === MicrosoftOffice.gitignore ===
+
+*.tmp
+
+# Word temporary
+~$*.doc*
+
+# Word Auto Backup File
+Backup of *.doc*
+
+# Excel temporary
+~$*.xls*
+
+# Excel Backup File
+*.xlk
+
+# PowerPoint temporary
+~$*.ppt*
+
+# Visio autosave temporary files
+*.~vsd*
diff --git a/3_i18n/zh_CN/LC_MESSAGES/mm678.po b/3_i18n/zh_CN/LC_MESSAGES/mm678.po
diff --git a/non_text/MM8Setup/bitmap/位图_135en.bmp → non_text/MM8Setup/zh_CN/dev/位图_135en.bmp b/non_text/MM8Setup/bitmap/位图_135en.bmp → non_text/MM8Setup/zh_CN/dev/位图_135en.bmp
diff --git a/non_text/MM8Setup/bitmap/位图_135zh.bmp → non_text/MM8Setup/zh_CN/dev/位图_135zh.bmp b/non_text/MM8Setup/bitmap/位图_135zh.bmp → non_text/MM8Setup/zh_CN/dev/位图_135zh.bmp
diff --git a/non_text/MM8Setup/bitmap/位图_135zhmerge.bmp → ...text/MM8Setup/zh_CN/dev/位图_135zhmerge.bmp b/non_text/MM8Setup/bitmap/位图_135zhmerge.bmp → ...text/MM8Setup/zh_CN/dev/位图_135zhmerge.bmp
diff --git a/...text/MM8Setup/bitmap/位图_135zhmerge.fw.png → ...t/MM8Setup/zh_CN/dev/位图_135zhmerge.fw.png b/...text/MM8Setup/bitmap/位图_135zhmerge.fw.png → ...t/MM8Setup/zh_CN/dev/位图_135zhmerge.fw.png
diff --git a/non_text/MM8Setup/mm8/MM8Setup.Exe → ...text/MM8Setup/zh_CN/prod/mm8/MM8Setup.Exe b/non_text/MM8Setup/mm8/MM8Setup.Exe → ...text/MM8Setup/zh_CN/prod/mm8/MM8Setup.Exe
diff --git a/non_text/MM8Setup/mmmerge/MM8Setup.Exe → .../MM8Setup/zh_CN/prod/mmmerge/MM8Setup.Exe b/non_text/MM8Setup/mmmerge/MM8Setup.Exe → .../MM8Setup/zh_CN/prod/mmmerge/MM8Setup.Exe
diff --git a/non_text/img/en/source/compass/mm6/COMPASS.bmp b/non_text/img/en/source/compass/mm6/COMPASS.bmp
diff --git a/non_text/img/en/source/compass/mm7/ib-comp-a.bmp b/non_text/img/en/source/compass/mm7/ib-comp-a.bmp
diff --git a/non_text/img/en/source/compass/mm7/ib-comp-b.bmp b/non_text/img/en/source/compass/mm7/ib-comp-b.bmp
diff --git a/non_text/img/en/source/compass/mm7/ib-comp-c.bmp b/non_text/img/en/source/compass/mm7/ib-comp-c.bmp
diff --git a/non_text/img/en/source/compass/mm8/IB-COMP-a.bmp b/non_text/img/en/source/compass/mm8/IB-COMP-a.bmp
diff --git a/non_text/img/en_merge_source/But20H.bmp → non_text/img/en/source/mmmerge/But20H.bmp b/non_text/img/en_merge_source/But20H.bmp → non_text/img/en/source/mmmerge/But20H.bmp
diff --git a/non_text/img/en_merge_source/But20U.bmp → non_text/img/en/source/mmmerge/But20U.bmp b/non_text/img/en_merge_source/But20U.bmp → non_text/img/en/source/mmmerge/But20U.bmp
diff --git a/non_text/img/en_merge_source/ButHireD.bmp → non_text/img/en/source/mmmerge/ButHireD.bmp b/non_text/img/en_merge_source/ButHireD.bmp → non_text/img/en/source/mmmerge/ButHireD.bmp
diff --git a/non_text/img/en_merge_source/ButHireH.bmp → non_text/img/en/source/mmmerge/ButHireH.bmp b/non_text/img/en_merge_source/ButHireH.bmp → non_text/img/en/source/mmmerge/ButHireH.bmp
diff --git a/non_text/img/en_merge_source/ButHireU.bmp → non_text/img/en/source/mmmerge/ButHireU.bmp b/non_text/img/en_merge_source/ButHireU.bmp → non_text/img/en/source/mmmerge/ButHireU.bmp
diff --git a/non_text/img/en_merge_source/IB-COMP-a.bmp → non_text/img/en/source/mmmerge/IB-COMP-a.bmp b/non_text/img/en_merge_source/IB-COMP-a.bmp → non_text/img/en/source/mmmerge/IB-COMP-a.bmp
diff --git a/non_text/img/en_merge_source/IRT11b.bmp → non_text/img/en/source/mmmerge/IRT11b.bmp b/non_text/img/en_merge_source/IRT11b.bmp → non_text/img/en/source/mmmerge/IRT11b.bmp
diff --git a/non_text/img/en_merge_source/IRT11r.bmp → non_text/img/en/source/mmmerge/IRT11r.bmp b/non_text/img/en_merge_source/IRT11r.bmp → non_text/img/en/source/mmmerge/IRT11r.bmp
diff --git a/non_text/img/en_merge_source/IRT12b.bmp → non_text/img/en/source/mmmerge/IRT12b.bmp b/non_text/img/en_merge_source/IRT12b.bmp → non_text/img/en/source/mmmerge/IRT12b.bmp
diff --git a/non_text/img/en_merge_source/IRT12r.bmp → non_text/img/en/source/mmmerge/IRT12r.bmp b/non_text/img/en_merge_source/IRT12r.bmp → non_text/img/en/source/mmmerge/IRT12r.bmp
diff --git a/non_text/img/en_merge_source/IRT13b.bmp → non_text/img/en/source/mmmerge/IRT13b.bmp b/non_text/img/en_merge_source/IRT13b.bmp → non_text/img/en/source/mmmerge/IRT13b.bmp
diff --git a/non_text/img/en_merge_source/IRT13r.bmp → non_text/img/en/source/mmmerge/IRT13r.bmp b/non_text/img/en_merge_source/IRT13r.bmp → non_text/img/en/source/mmmerge/IRT13r.bmp
diff --git a/non_text/img/en_merge_source/IRT14b.bmp → non_text/img/en/source/mmmerge/IRT14b.bmp b/non_text/img/en_merge_source/IRT14b.bmp → non_text/img/en/source/mmmerge/IRT14b.bmp
diff --git a/non_text/img/en_merge_source/IRT14r.bmp → non_text/img/en/source/mmmerge/IRT14r.bmp b/non_text/img/en_merge_source/IRT14r.bmp → non_text/img/en/source/mmmerge/IRT14r.bmp
diff --git a/non_text/img/en_merge_source/Lsave640.bmp → non_text/img/en/source/mmmerge/Lsave640.bmp b/non_text/img/en_merge_source/Lsave640.bmp → non_text/img/en/source/mmmerge/Lsave640.bmp
diff --git a/non_text/img/en_merge_source/Options.bmp → non_text/img/en/source/mmmerge/Options.bmp b/non_text/img/en_merge_source/Options.bmp → non_text/img/en/source/mmmerge/Options.bmp
diff --git a/non_text/img/en_merge_source/R1hD.bmp → non_text/img/en/source/mmmerge/R1hD.bmp b/non_text/img/en_merge_source/R1hD.bmp → non_text/img/en/source/mmmerge/R1hD.bmp
diff --git a/non_text/img/en_merge_source/R1hH.bmp → non_text/img/en/source/mmmerge/R1hH.bmp b/non_text/img/en_merge_source/R1hH.bmp → non_text/img/en/source/mmmerge/R1hH.bmp
diff --git a/non_text/img/en_merge_source/R1hU.bmp → non_text/img/en/source/mmmerge/R1hU.bmp b/non_text/img/en_merge_source/R1hU.bmp → non_text/img/en/source/mmmerge/R1hU.bmp
diff --git a/non_text/img/en_merge_source/R5mD.bmp → non_text/img/en/source/mmmerge/R5mD.bmp b/non_text/img/en_merge_source/R5mD.bmp → non_text/img/en/source/mmmerge/R5mD.bmp
diff --git a/non_text/img/en_merge_source/R5mH.bmp → non_text/img/en/source/mmmerge/R5mH.bmp b/non_text/img/en_merge_source/R5mH.bmp → non_text/img/en/source/mmmerge/R5mH.bmp
diff --git a/non_text/img/en_merge_source/R5mU.bmp → non_text/img/en/source/mmmerge/R5mU.bmp b/non_text/img/en_merge_source/R5mU.bmp → non_text/img/en/source/mmmerge/R5mU.bmp
diff --git a/non_text/img/en_merge_source/R8hD.bmp → non_text/img/en/source/mmmerge/R8hD.bmp b/non_text/img/en_merge_source/R8hD.bmp → non_text/img/en/source/mmmerge/R8hD.bmp
diff --git a/non_text/img/en_merge_source/R8hH.bmp → non_text/img/en/source/mmmerge/R8hH.bmp b/non_text/img/en_merge_source/R8hH.bmp → non_text/img/en/source/mmmerge/R8hH.bmp
diff --git a/non_text/img/en_merge_source/R8hU.bmp → non_text/img/en/source/mmmerge/R8hU.bmp b/non_text/img/en_merge_source/R8hU.bmp → non_text/img/en/source/mmmerge/R8hU.bmp
diff --git a/non_text/img/en_merge_source/RdawnD.bmp → non_text/img/en/source/mmmerge/RdawnD.bmp b/non_text/img/en_merge_source/RdawnD.bmp → non_text/img/en/source/mmmerge/RdawnD.bmp
diff --git a/non_text/img/en_merge_source/RdawnH.bmp → non_text/img/en/source/mmmerge/RdawnH.bmp b/non_text/img/en_merge_source/RdawnH.bmp → non_text/img/en/source/mmmerge/RdawnH.bmp
diff --git a/non_text/img/en_merge_source/RdawnU.bmp → non_text/img/en/source/mmmerge/RdawnU.bmp b/non_text/img/en_merge_source/RdawnU.bmp → non_text/img/en/source/mmmerge/RdawnU.bmp
diff --git a/non_text/img/en_merge_source/RexitD.bmp → non_text/img/en/source/mmmerge/RexitD.bmp b/non_text/img/en_merge_source/RexitD.bmp → non_text/img/en/source/mmmerge/RexitD.bmp
diff --git a/non_text/img/en_merge_source/RexitH.bmp → non_text/img/en/source/mmmerge/RexitH.bmp b/non_text/img/en_merge_source/RexitH.bmp → non_text/img/en/source/mmmerge/RexitH.bmp
diff --git a/non_text/img/en_merge_source/RexitU.bmp → non_text/img/en/source/mmmerge/RexitU.bmp b/non_text/img/en_merge_source/RexitU.bmp → non_text/img/en/source/mmmerge/RexitU.bmp
diff --git a/non_text/img/en_merge_source/T_cred_dn.bmp → non_text/img/en/source/mmmerge/T_cred_dn.bmp b/non_text/img/en_merge_source/T_cred_dn.bmp → non_text/img/en/source/mmmerge/T_cred_dn.bmp
diff --git a/non_text/img/en_merge_source/T_cred_ht.bmp → non_text/img/en/source/mmmerge/T_cred_ht.bmp b/non_text/img/en_merge_source/T_cred_ht.bmp → non_text/img/en/source/mmmerge/T_cred_ht.bmp
diff --git a/non_text/img/en_merge_source/T_cred_up.bmp → non_text/img/en/source/mmmerge/T_cred_up.bmp b/non_text/img/en_merge_source/T_cred_up.bmp → non_text/img/en/source/mmmerge/T_cred_up.bmp
diff --git a/non_text/img/en_merge_source/T_load_dn.bmp → non_text/img/en/source/mmmerge/T_load_dn.bmp b/non_text/img/en_merge_source/T_load_dn.bmp → non_text/img/en/source/mmmerge/T_load_dn.bmp
diff --git a/non_text/img/en_merge_source/T_load_ht.bmp → non_text/img/en/source/mmmerge/T_load_ht.bmp b/non_text/img/en_merge_source/T_load_ht.bmp → non_text/img/en/source/mmmerge/T_load_ht.bmp
diff --git a/non_text/img/en_merge_source/T_load_up.bmp → non_text/img/en/source/mmmerge/T_load_up.bmp b/non_text/img/en_merge_source/T_load_up.bmp → non_text/img/en/source/mmmerge/T_load_up.bmp
diff --git a/non_text/img/en_merge_source/T_new_dn.bmp → non_text/img/en/source/mmmerge/T_new_dn.bmp b/non_text/img/en_merge_source/T_new_dn.bmp → non_text/img/en/source/mmmerge/T_new_dn.bmp
diff --git a/non_text/img/en_merge_source/T_new_ht.bmp → non_text/img/en/source/mmmerge/T_new_ht.bmp b/non_text/img/en_merge_source/T_new_ht.bmp → non_text/img/en/source/mmmerge/T_new_ht.bmp
diff --git a/non_text/img/en_merge_source/T_new_up.bmp → non_text/img/en/source/mmmerge/T_new_up.bmp b/non_text/img/en_merge_source/T_new_up.bmp → non_text/img/en/source/mmmerge/T_new_up.bmp
diff --git a/non_text/img/en_merge_source/T_quit_dn.bmp → non_text/img/en/source/mmmerge/T_quit_dn.bmp b/non_text/img/en_merge_source/T_quit_dn.bmp → non_text/img/en/source/mmmerge/T_quit_dn.bmp
diff --git a/non_text/img/en_merge_source/T_quit_ht.bmp → non_text/img/en/source/mmmerge/T_quit_ht.bmp b/non_text/img/en_merge_source/T_quit_ht.bmp → non_text/img/en/source/mmmerge/T_quit_ht.bmp
diff --git a/non_text/img/en_merge_source/T_quit_up.bmp → non_text/img/en/source/mmmerge/T_quit_up.bmp b/non_text/img/en_merge_source/T_quit_up.bmp → non_text/img/en/source/mmmerge/T_quit_up.bmp
diff --git a/non_text/img/en_merge_source/Title.pcx → non_text/img/en/source/mmmerge/Title.pcx b/non_text/img/en_merge_source/Title.pcx → non_text/img/en/source/mmmerge/Title.pcx
diff --git a/non_text/img/en_merge_source/bl_Music.bmp → non_text/img/en/source/mmmerge/bl_Music.bmp b/non_text/img/en_merge_source/bl_Music.bmp → non_text/img/en/source/mmmerge/bl_Music.bmp
diff --git a/non_text/img/en_merge_source/bl_blspD.bmp → non_text/img/en/source/mmmerge/bl_blspD.bmp b/non_text/img/en_merge_source/bl_blspD.bmp → non_text/img/en/source/mmmerge/bl_blspD.bmp
diff --git a/non_text/img/en_merge_source/bl_blspG.bmp → non_text/img/en/source/mmmerge/bl_blspG.bmp b/non_text/img/en_merge_source/bl_blspG.bmp → non_text/img/en/source/mmmerge/bl_blspG.bmp
diff --git a/non_text/img/en_merge_source/bl_blspU.bmp → non_text/img/en/source/mmmerge/bl_blspU.bmp b/non_text/img/en_merge_source/bl_blspU.bmp → non_text/img/en/source/mmmerge/bl_blspU.bmp
diff --git a/non_text/img/en_merge_source/bl_brite.bmp → non_text/img/en/source/mmmerge/bl_brite.bmp b/non_text/img/en_merge_source/bl_brite.bmp → non_text/img/en/source/mmmerge/bl_brite.bmp
diff --git a/non_text/img/en_merge_source/bl_coltD.bmp → non_text/img/en/source/mmmerge/bl_coltD.bmp b/non_text/img/en_merge_source/bl_coltD.bmp → non_text/img/en/source/mmmerge/bl_coltD.bmp
diff --git a/non_text/img/en_merge_source/bl_coltG.bmp → non_text/img/en/source/mmmerge/bl_coltG.bmp b/non_text/img/en_merge_source/bl_coltG.bmp → non_text/img/en/source/mmmerge/bl_coltG.bmp
diff --git a/non_text/img/en_merge_source/bl_coltU.bmp → non_text/img/en/source/mmmerge/bl_coltU.bmp b/non_text/img/en_merge_source/bl_coltU.bmp → non_text/img/en/source/mmmerge/bl_coltU.bmp
diff --git a/non_text/img/en_merge_source/bl_prevu.bmp → non_text/img/en/source/mmmerge/bl_prevu.bmp b/non_text/img/en_merge_source/bl_prevu.bmp → non_text/img/en/source/mmmerge/bl_prevu.bmp
diff --git a/non_text/img/en_merge_source/bl_sound.bmp → non_text/img/en/source/mmmerge/bl_sound.bmp b/non_text/img/en_merge_source/bl_sound.bmp → non_text/img/en/source/mmmerge/bl_sound.bmp
diff --git a/non_text/img/en_merge_source/bl_tintD.bmp → non_text/img/en/source/mmmerge/bl_tintD.bmp b/non_text/img/en_merge_source/bl_tintD.bmp → non_text/img/en/source/mmmerge/bl_tintD.bmp
diff --git a/non_text/img/en_merge_source/bl_tintG.bmp → non_text/img/en/source/mmmerge/bl_tintG.bmp b/non_text/img/en_merge_source/bl_tintG.bmp → non_text/img/en/source/mmmerge/bl_tintG.bmp
diff --git a/non_text/img/en_merge_source/bl_tintU.bmp → non_text/img/en/source/mmmerge/bl_tintU.bmp b/non_text/img/en_merge_source/bl_tintU.bmp → non_text/img/en/source/mmmerge/bl_tintU.bmp
diff --git a/non_text/img/en_merge_source/bl_turn.bmp → non_text/img/en/source/mmmerge/bl_turn.bmp b/non_text/img/en_merge_source/bl_turn.bmp → non_text/img/en/source/mmmerge/bl_turn.bmp
diff --git a/non_text/img/en_merge_source/bl_voice.bmp → non_text/img/en/source/mmmerge/bl_voice.bmp b/non_text/img/en_merge_source/bl_voice.bmp → non_text/img/en/source/mmmerge/bl_voice.bmp
diff --git a/non_text/img/en_merge_source/bt_16xD.bmp → non_text/img/en/source/mmmerge/bt_16xD.bmp b/non_text/img/en_merge_source/bt_16xD.bmp → non_text/img/en/source/mmmerge/bt_16xD.bmp
diff --git a/non_text/img/en_merge_source/bt_16xU.bmp → non_text/img/en/source/mmmerge/bt_16xU.bmp b/non_text/img/en_merge_source/bt_16xU.bmp → non_text/img/en/source/mmmerge/bt_16xU.bmp
diff --git a/non_text/img/en_merge_source/bt_32xD.bmp → non_text/img/en/source/mmmerge/bt_32xD.bmp b/non_text/img/en_merge_source/bt_32xD.bmp → non_text/img/en/source/mmmerge/bt_32xD.bmp
diff --git a/non_text/img/en_merge_source/bt_32xU.bmp → non_text/img/en/source/mmmerge/bt_32xU.bmp b/non_text/img/en_merge_source/bt_32xU.bmp → non_text/img/en/source/mmmerge/bt_32xU.bmp
diff --git a/non_text/img/en_merge_source/bt_DfltD.bmp → non_text/img/en/source/mmmerge/bt_DfltD.bmp b/non_text/img/en_merge_source/bt_DfltD.bmp → non_text/img/en/source/mmmerge/bt_DfltD.bmp
diff --git a/non_text/img/en_merge_source/bt_DfltH.bmp → non_text/img/en/source/mmmerge/bt_DfltH.bmp b/non_text/img/en_merge_source/bt_DfltH.bmp → non_text/img/en/source/mmmerge/bt_DfltH.bmp
diff --git a/non_text/img/en_merge_source/bt_DfltU.bmp → non_text/img/en/source/mmmerge/bt_DfltU.bmp b/non_text/img/en_merge_source/bt_DfltU.bmp → non_text/img/en/source/mmmerge/bt_DfltU.bmp
diff --git a/non_text/img/en_merge_source/bt_P1D.bmp → non_text/img/en/source/mmmerge/bt_P1D.bmp b/non_text/img/en_merge_source/bt_P1D.bmp → non_text/img/en/source/mmmerge/bt_P1D.bmp
diff --git a/non_text/img/en_merge_source/bt_P1H.bmp → non_text/img/en/source/mmmerge/bt_P1H.bmp b/non_text/img/en_merge_source/bt_P1H.bmp → non_text/img/en/source/mmmerge/bt_P1H.bmp
diff --git a/non_text/img/en_merge_source/bt_P1U.bmp → non_text/img/en/source/mmmerge/bt_P1U.bmp b/non_text/img/en_merge_source/bt_P1U.bmp → non_text/img/en/source/mmmerge/bt_P1U.bmp
diff --git a/non_text/img/en_merge_source/bt_P2D.bmp → non_text/img/en/source/mmmerge/bt_P2D.bmp b/non_text/img/en_merge_source/bt_P2D.bmp → non_text/img/en/source/mmmerge/bt_P2D.bmp
diff --git a/non_text/img/en_merge_source/bt_P2H.bmp → non_text/img/en/source/mmmerge/bt_P2H.bmp b/non_text/img/en_merge_source/bt_P2H.bmp → non_text/img/en/source/mmmerge/bt_P2H.bmp
diff --git a/non_text/img/en_merge_source/bt_P2U.bmp → non_text/img/en/source/mmmerge/bt_P2U.bmp b/non_text/img/en_merge_source/bt_P2U.bmp → non_text/img/en/source/mmmerge/bt_P2U.bmp
diff --git a/non_text/img/en_merge_source/bt_RtrnD.bmp → non_text/img/en/source/mmmerge/bt_RtrnD.bmp b/non_text/img/en_merge_source/bt_RtrnD.bmp → non_text/img/en/source/mmmerge/bt_RtrnD.bmp
diff --git a/non_text/img/en_merge_source/bt_RtrnH.bmp → non_text/img/en/source/mmmerge/bt_RtrnH.bmp b/non_text/img/en_merge_source/bt_RtrnH.bmp → non_text/img/en/source/mmmerge/bt_RtrnH.bmp
diff --git a/non_text/img/en_merge_source/bt_RtrnU.bmp → non_text/img/en/source/mmmerge/bt_RtrnU.bmp b/non_text/img/en_merge_source/bt_RtrnU.bmp → non_text/img/en/source/mmmerge/bt_RtrnU.bmp
diff --git a/non_text/img/en_merge_source/bt_backD.bmp → non_text/img/en/source/mmmerge/bt_backD.bmp b/non_text/img/en_merge_source/bt_backD.bmp → non_text/img/en/source/mmmerge/bt_backD.bmp
diff --git a/non_text/img/en_merge_source/bt_backH.bmp → non_text/img/en/source/mmmerge/bt_backH.bmp b/non_text/img/en_merge_source/bt_backH.bmp → non_text/img/en/source/mmmerge/bt_backH.bmp
diff --git a/non_text/img/en_merge_source/bt_backU.bmp → non_text/img/en/source/mmmerge/bt_backU.bmp b/non_text/img/en_merge_source/bt_backU.bmp → non_text/img/en/source/mmmerge/bt_backU.bmp
diff --git a/non_text/img/en_merge_source/bt_cfkbD.bmp → non_text/img/en/source/mmmerge/bt_cfkbD.bmp b/non_text/img/en_merge_source/bt_cfkbD.bmp → non_text/img/en/source/mmmerge/bt_cfkbD.bmp
diff --git a/non_text/img/en_merge_source/bt_cfkbH.bmp → non_text/img/en/source/mmmerge/bt_cfkbH.bmp b/non_text/img/en_merge_source/bt_cfkbH.bmp → non_text/img/en/source/mmmerge/bt_cfkbH.bmp
diff --git a/non_text/img/en_merge_source/bt_cfkbU.bmp → non_text/img/en/source/mmmerge/bt_cfkbU.bmp b/non_text/img/en_merge_source/bt_cfkbU.bmp → non_text/img/en/source/mmmerge/bt_cfkbU.bmp
diff --git a/non_text/img/en_merge_source/bt_cnclD.bmp → non_text/img/en/source/mmmerge/bt_cnclD.bmp b/non_text/img/en_merge_source/bt_cnclD.bmp → non_text/img/en/source/mmmerge/bt_cnclD.bmp
diff --git a/non_text/img/en_merge_source/bt_cnclH.bmp → non_text/img/en/source/mmmerge/bt_cnclH.bmp b/non_text/img/en_merge_source/bt_cnclH.bmp → non_text/img/en/source/mmmerge/bt_cnclH.bmp
diff --git a/non_text/img/en_merge_source/bt_cnclU.bmp → non_text/img/en/source/mmmerge/bt_cnclU.bmp b/non_text/img/en_merge_source/bt_cnclU.bmp → non_text/img/en/source/mmmerge/bt_cnclU.bmp
diff --git a/non_text/img/en_merge_source/bt_contD.bmp → non_text/img/en/source/mmmerge/bt_contD.bmp b/non_text/img/en_merge_source/bt_contD.bmp → non_text/img/en/source/mmmerge/bt_contD.bmp
diff --git a/non_text/img/en_merge_source/bt_contH.bmp → non_text/img/en/source/mmmerge/bt_contH.bmp b/non_text/img/en_merge_source/bt_contH.bmp → non_text/img/en/source/mmmerge/bt_contH.bmp
diff --git a/non_text/img/en_merge_source/bt_contU.bmp → non_text/img/en/source/mmmerge/bt_contU.bmp b/non_text/img/en_merge_source/bt_contU.bmp → non_text/img/en/source/mmmerge/bt_contU.bmp
diff --git a/non_text/img/en_merge_source/bt_flipD.bmp → non_text/img/en/source/mmmerge/bt_flipD.bmp b/non_text/img/en_merge_source/bt_flipD.bmp → non_text/img/en/source/mmmerge/bt_flipD.bmp
diff --git a/non_text/img/en_merge_source/bt_flipU.bmp → non_text/img/en/source/mmmerge/bt_flipU.bmp b/non_text/img/en_merge_source/bt_flipU.bmp → non_text/img/en/source/mmmerge/bt_flipU.bmp
diff --git a/non_text/img/en_merge_source/bt_hitsD.bmp → non_text/img/en/source/mmmerge/bt_hitsD.bmp b/non_text/img/en_merge_source/bt_hitsD.bmp → non_text/img/en/source/mmmerge/bt_hitsD.bmp
diff --git a/non_text/img/en_merge_source/bt_hitsU.bmp → non_text/img/en/source/mmmerge/bt_hitsU.bmp b/non_text/img/en_merge_source/bt_hitsU.bmp → non_text/img/en/source/mmmerge/bt_hitsU.bmp
diff --git a/non_text/img/en_merge_source/bt_loadD.bmp → non_text/img/en/source/mmmerge/bt_loadD.bmp b/non_text/img/en_merge_source/bt_loadD.bmp → non_text/img/en/source/mmmerge/bt_loadD.bmp
diff --git a/non_text/img/en_merge_source/bt_loadH.bmp → non_text/img/en/source/mmmerge/bt_loadH.bmp b/non_text/img/en_merge_source/bt_loadH.bmp → non_text/img/en/source/mmmerge/bt_loadH.bmp
diff --git a/non_text/img/en_merge_source/bt_loadU.bmp → non_text/img/en/source/mmmerge/bt_loadU.bmp b/non_text/img/en_merge_source/bt_loadU.bmp → non_text/img/en/source/mmmerge/bt_loadU.bmp
diff --git a/non_text/img/en_merge_source/bt_loagD.bmp → non_text/img/en/source/mmmerge/bt_loagD.bmp b/non_text/img/en_merge_source/bt_loagD.bmp → non_text/img/en/source/mmmerge/bt_loagD.bmp
diff --git a/non_text/img/en_merge_source/bt_loagH.bmp → non_text/img/en/source/mmmerge/bt_loagH.bmp b/non_text/img/en_merge_source/bt_loagH.bmp → non_text/img/en/source/mmmerge/bt_loagH.bmp
diff --git a/non_text/img/en_merge_source/bt_loagU.bmp → non_text/img/en/source/mmmerge/bt_loagU.bmp b/non_text/img/en_merge_source/bt_loagU.bmp → non_text/img/en/source/mmmerge/bt_loagU.bmp
diff --git a/non_text/img/en_merge_source/bt_newD.bmp → non_text/img/en/source/mmmerge/bt_newD.bmp b/non_text/img/en_merge_source/bt_newD.bmp → non_text/img/en/source/mmmerge/bt_newD.bmp
diff --git a/non_text/img/en_merge_source/bt_newH.bmp → non_text/img/en/source/mmmerge/bt_newH.bmp b/non_text/img/en_merge_source/bt_newH.bmp → non_text/img/en/source/mmmerge/bt_newH.bmp
diff --git a/non_text/img/en_merge_source/bt_newU.bmp → non_text/img/en/source/mmmerge/bt_newU.bmp b/non_text/img/en_merge_source/bt_newU.bmp → non_text/img/en/source/mmmerge/bt_newU.bmp
diff --git a/non_text/img/en_merge_source/bt_quitD.bmp → non_text/img/en/source/mmmerge/bt_quitD.bmp b/non_text/img/en_merge_source/bt_quitD.bmp → non_text/img/en/source/mmmerge/bt_quitD.bmp
diff --git a/non_text/img/en_merge_source/bt_quitH.bmp → non_text/img/en/source/mmmerge/bt_quitH.bmp b/non_text/img/en_merge_source/bt_quitH.bmp → non_text/img/en/source/mmmerge/bt_quitH.bmp
diff --git a/non_text/img/en_merge_source/bt_quitU.bmp → non_text/img/en/source/mmmerge/bt_quitU.bmp b/non_text/img/en_merge_source/bt_quitU.bmp → non_text/img/en/source/mmmerge/bt_quitU.bmp
diff --git a/non_text/img/en_merge_source/bt_runD.bmp → non_text/img/en/source/mmmerge/bt_runD.bmp b/non_text/img/en_merge_source/bt_runD.bmp → non_text/img/en/source/mmmerge/bt_runD.bmp
diff --git a/non_text/img/en_merge_source/bt_runU.bmp → non_text/img/en/source/mmmerge/bt_runU.bmp b/non_text/img/en_merge_source/bt_runU.bmp → non_text/img/en/source/mmmerge/bt_runU.bmp
diff --git a/non_text/img/en_merge_source/bt_sageD.bmp → non_text/img/en/source/mmmerge/bt_sageD.bmp b/non_text/img/en_merge_source/bt_sageD.bmp → non_text/img/en/source/mmmerge/bt_sageD.bmp
diff --git a/non_text/img/en_merge_source/bt_sageH.bmp → non_text/img/en/source/mmmerge/bt_sageH.bmp b/non_text/img/en_merge_source/bt_sageH.bmp → non_text/img/en/source/mmmerge/bt_sageH.bmp
diff --git a/non_text/img/en_merge_source/bt_sageU.bmp → non_text/img/en/source/mmmerge/bt_sageU.bmp b/non_text/img/en_merge_source/bt_sageU.bmp → non_text/img/en/source/mmmerge/bt_sageU.bmp
diff --git a/non_text/img/en_merge_source/bt_saveD.bmp → non_text/img/en/source/mmmerge/bt_saveD.bmp b/non_text/img/en_merge_source/bt_saveD.bmp → non_text/img/en/source/mmmerge/bt_saveD.bmp
diff --git a/non_text/img/en_merge_source/bt_saveH.bmp → non_text/img/en/source/mmmerge/bt_saveH.bmp b/non_text/img/en_merge_source/bt_saveH.bmp → non_text/img/en/source/mmmerge/bt_saveH.bmp
diff --git a/non_text/img/en_merge_source/bt_saveU.bmp → non_text/img/en/source/mmmerge/bt_saveU.bmp b/non_text/img/en_merge_source/bt_saveU.bmp → non_text/img/en/source/mmmerge/bt_saveU.bmp
diff --git a/non_text/img/en_merge_source/bt_smooD.bmp → non_text/img/en/source/mmmerge/bt_smooD.bmp b/non_text/img/en_merge_source/bt_smooD.bmp → non_text/img/en/source/mmmerge/bt_smooD.bmp
diff --git a/non_text/img/en_merge_source/bt_smooU.bmp → non_text/img/en/source/mmmerge/bt_smooU.bmp b/non_text/img/en_merge_source/bt_smooU.bmp → non_text/img/en/source/mmmerge/bt_smooU.bmp
diff --git a/non_text/img/en_merge_source/bt_vdopD.bmp → non_text/img/en/source/mmmerge/bt_vdopD.bmp b/non_text/img/en_merge_source/bt_vdopD.bmp → non_text/img/en/source/mmmerge/bt_vdopD.bmp
diff --git a/non_text/img/en_merge_source/bt_vdopH.bmp → non_text/img/en/source/mmmerge/bt_vdopH.bmp b/non_text/img/en_merge_source/bt_vdopH.bmp → non_text/img/en/source/mmmerge/bt_vdopH.bmp
diff --git a/non_text/img/en_merge_source/bt_vdopU.bmp → non_text/img/en/source/mmmerge/bt_vdopU.bmp b/non_text/img/en_merge_source/bt_vdopU.bmp → non_text/img/en/source/mmmerge/bt_vdopU.bmp
diff --git a/non_text/img/en_merge_source/bt_wksdD.bmp → non_text/img/en/source/mmmerge/bt_wksdD.bmp b/non_text/img/en_merge_source/bt_wksdD.bmp → non_text/img/en/source/mmmerge/bt_wksdD.bmp
diff --git a/non_text/img/en_merge_source/bt_wksdU.bmp → non_text/img/en/source/mmmerge/bt_wksdU.bmp b/non_text/img/en_merge_source/bt_wksdU.bmp → non_text/img/en/source/mmmerge/bt_wksdU.bmp
diff --git a/non_text/img/en_merge_source/bu_loadD.bmp → non_text/img/en/source/mmmerge/bu_loadD.bmp b/non_text/img/en_merge_source/bu_loadD.bmp → non_text/img/en/source/mmmerge/bu_loadD.bmp
diff --git a/non_text/img/en_merge_source/bu_loadH.bmp → non_text/img/en/source/mmmerge/bu_loadH.bmp b/non_text/img/en_merge_source/bu_loadH.bmp → non_text/img/en/source/mmmerge/bu_loadH.bmp
diff --git a/non_text/img/en_merge_source/bu_loadU.bmp → non_text/img/en/source/mmmerge/bu_loadU.bmp b/non_text/img/en_merge_source/bu_loadU.bmp → non_text/img/en/source/mmmerge/bu_loadU.bmp
diff --git a/non_text/img/en_merge_source/bu_rtrnD.bmp → non_text/img/en/source/mmmerge/bu_rtrnD.bmp b/non_text/img/en_merge_source/bu_rtrnD.bmp → non_text/img/en/source/mmmerge/bu_rtrnD.bmp
diff --git a/non_text/img/en_merge_source/bu_rtrnH.bmp → non_text/img/en/source/mmmerge/bu_rtrnH.bmp b/non_text/img/en_merge_source/bu_rtrnH.bmp → non_text/img/en/source/mmmerge/bu_rtrnH.bmp
diff --git a/non_text/img/en_merge_source/bu_rtrnU.bmp → non_text/img/en/source/mmmerge/bu_rtrnU.bmp b/non_text/img/en_merge_source/bu_rtrnU.bmp → non_text/img/en/source/mmmerge/bu_rtrnU.bmp
diff --git a/non_text/img/en_merge_source/bu_saveD.bmp → non_text/img/en/source/mmmerge/bu_saveD.bmp b/non_text/img/en_merge_source/bu_saveD.bmp → non_text/img/en/source/mmmerge/bu_saveD.bmp
diff --git a/non_text/img/en_merge_source/bu_saveH.bmp → non_text/img/en/source/mmmerge/bu_saveH.bmp b/non_text/img/en_merge_source/bu_saveH.bmp → non_text/img/en/source/mmmerge/bu_saveH.bmp
diff --git a/non_text/img/en_merge_source/bu_saveU.bmp → non_text/img/en/source/mmmerge/bu_saveU.bmp b/non_text/img/en_merge_source/bu_saveU.bmp → non_text/img/en/source/mmmerge/bu_saveU.bmp
diff --git a/non_text/img/en_merge_source/but20D.bmp → non_text/img/en/source/mmmerge/but20D.bmp b/non_text/img/en_merge_source/but20D.bmp → non_text/img/en/source/mmmerge/but20D.bmp
diff --git a/non_text/img/en_merge_source/but21D.bmp → non_text/img/en/source/mmmerge/but21D.bmp b/non_text/img/en_merge_source/but21D.bmp → non_text/img/en/source/mmmerge/but21D.bmp
diff --git a/non_text/img/en_merge_source/but21H.bmp → non_text/img/en/source/mmmerge/but21H.bmp b/non_text/img/en_merge_source/but21H.bmp → non_text/img/en/source/mmmerge/but21H.bmp
diff --git a/non_text/img/en_merge_source/but21U.bmp → non_text/img/en/source/mmmerge/but21U.bmp b/non_text/img/en_merge_source/but21U.bmp → non_text/img/en/source/mmmerge/but21U.bmp
diff --git a/non_text/img/en_merge_source/but22D.bmp → non_text/img/en/source/mmmerge/but22D.bmp b/non_text/img/en_merge_source/but22D.bmp → non_text/img/en/source/mmmerge/but22D.bmp
diff --git a/non_text/img/en_merge_source/but22H.bmp → non_text/img/en/source/mmmerge/but22H.bmp b/non_text/img/en_merge_source/but22H.bmp → non_text/img/en/source/mmmerge/but22H.bmp
diff --git a/non_text/img/en_merge_source/but22U.bmp → non_text/img/en/source/mmmerge/but22U.bmp b/non_text/img/en_merge_source/but22U.bmp → non_text/img/en/source/mmmerge/but22U.bmp
diff --git a/non_text/img/en_merge_source/but23H.bmp → non_text/img/en/source/mmmerge/but23H.bmp b/non_text/img/en_merge_source/but23H.bmp → non_text/img/en/source/mmmerge/but23H.bmp
diff --git a/non_text/img/en_merge_source/but23U.bmp → non_text/img/en/source/mmmerge/but23U.bmp b/non_text/img/en_merge_source/but23U.bmp → non_text/img/en/source/mmmerge/but23U.bmp
diff --git a/non_text/img/en_merge_source/but23d.bmp → non_text/img/en/source/mmmerge/but23d.bmp b/non_text/img/en_merge_source/but23d.bmp → non_text/img/en/source/mmmerge/but23d.bmp
diff --git a/non_text/img/en_merge_source/but24D.bmp → non_text/img/en/source/mmmerge/but24D.bmp b/non_text/img/en_merge_source/but24D.bmp → non_text/img/en/source/mmmerge/but24D.bmp
diff --git a/non_text/img/en_merge_source/but24H.bmp → non_text/img/en/source/mmmerge/but24H.bmp b/non_text/img/en_merge_source/but24H.bmp → non_text/img/en/source/mmmerge/but24H.bmp
diff --git a/non_text/img/en_merge_source/but24U.bmp → non_text/img/en/source/mmmerge/but24U.bmp b/non_text/img/en_merge_source/but24U.bmp → non_text/img/en/source/mmmerge/but24U.bmp
diff --git a/non_text/img/en_merge_source/but25D.bmp → non_text/img/en/source/mmmerge/but25D.bmp b/non_text/img/en_merge_source/but25D.bmp → non_text/img/en/source/mmmerge/but25D.bmp
diff --git a/non_text/img/en_merge_source/but25H.bmp → non_text/img/en/source/mmmerge/but25H.bmp b/non_text/img/en_merge_source/but25H.bmp → non_text/img/en/source/mmmerge/but25H.bmp
diff --git a/non_text/img/en_merge_source/but25U.bmp → non_text/img/en/source/mmmerge/but25U.bmp b/non_text/img/en_merge_source/but25U.bmp → non_text/img/en/source/mmmerge/but25U.bmp
diff --git a/non_text/img/en_merge_source/but26D.bmp → non_text/img/en/source/mmmerge/but26D.bmp b/non_text/img/en_merge_source/but26D.bmp → non_text/img/en/source/mmmerge/but26D.bmp
diff --git a/non_text/img/en_merge_source/but26H.bmp → non_text/img/en/source/mmmerge/but26H.bmp b/non_text/img/en_merge_source/but26H.bmp → non_text/img/en/source/mmmerge/but26H.bmp
diff --git a/non_text/img/en_merge_source/but26U.bmp → non_text/img/en/source/mmmerge/but26U.bmp b/non_text/img/en_merge_source/but26U.bmp → non_text/img/en/source/mmmerge/but26U.bmp
diff --git a/non_text/img/en_merge_source/bv_rtrnD.bmp → non_text/img/en/source/mmmerge/bv_rtrnD.bmp b/non_text/img/en_merge_source/bv_rtrnD.bmp → non_text/img/en/source/mmmerge/bv_rtrnD.bmp
diff --git a/non_text/img/en_merge_source/bv_rtrnH.bmp → non_text/img/en/source/mmmerge/bv_rtrnH.bmp b/non_text/img/en_merge_source/bv_rtrnH.bmp → non_text/img/en/source/mmmerge/bv_rtrnH.bmp
diff --git a/non_text/img/en_merge_source/bv_rtrnU.bmp → non_text/img/en/source/mmmerge/bv_rtrnU.bmp b/non_text/img/en_merge_source/bv_rtrnU.bmp → non_text/img/en/source/mmmerge/bv_rtrnU.bmp
diff --git a/non_text/img/en_merge_source/c_close_DN.bmp → ...text/img/en/source/mmmerge/c_close_DN.bmp b/non_text/img/en_merge_source/c_close_DN.bmp → ...text/img/en/source/mmmerge/c_close_DN.bmp
diff --git a/non_text/img/en_merge_source/c_close_ht.bmp → ...text/img/en/source/mmmerge/c_close_ht.bmp b/non_text/img/en_merge_source/c_close_ht.bmp → ...text/img/en/source/mmmerge/c_close_ht.bmp
diff --git a/non_text/img/en_merge_source/c_close_up.bmp → ...text/img/en/source/mmmerge/c_close_up.bmp b/non_text/img/en_merge_source/c_close_up.bmp → ...text/img/en/source/mmmerge/c_close_up.bmp
diff --git a/non_text/img/en_merge_source/c_clr_dn.bmp → non_text/img/en/source/mmmerge/c_clr_dn.bmp b/non_text/img/en_merge_source/c_clr_dn.bmp → non_text/img/en/source/mmmerge/c_clr_dn.bmp
diff --git a/non_text/img/en_merge_source/c_clr_ht.bmp → non_text/img/en/source/mmmerge/c_clr_ht.bmp b/non_text/img/en_merge_source/c_clr_ht.bmp → non_text/img/en/source/mmmerge/c_clr_ht.bmp
diff --git a/non_text/img/en_merge_source/c_clr_up.bmp → non_text/img/en/source/mmmerge/c_clr_up.bmp b/non_text/img/en_merge_source/c_clr_up.bmp → non_text/img/en/source/mmmerge/c_clr_up.bmp
diff --git a/non_text/img/en_merge_source/c_cncl_dn.bmp → non_text/img/en/source/mmmerge/c_cncl_dn.bmp b/non_text/img/en_merge_source/c_cncl_dn.bmp → non_text/img/en/source/mmmerge/c_cncl_dn.bmp
diff --git a/non_text/img/en_merge_source/c_cncl_ht.bmp → non_text/img/en/source/mmmerge/c_cncl_ht.bmp b/non_text/img/en_merge_source/c_cncl_ht.bmp → non_text/img/en/source/mmmerge/c_cncl_ht.bmp
diff --git a/non_text/img/en_merge_source/c_cncl_up.bmp → non_text/img/en/source/mmmerge/c_cncl_up.bmp b/non_text/img/en_merge_source/c_cncl_up.bmp → non_text/img/en/source/mmmerge/c_cncl_up.bmp
diff --git a/non_text/img/en_merge_source/c_dft_dn.bmp → non_text/img/en/source/mmmerge/c_dft_dn.bmp b/non_text/img/en_merge_source/c_dft_dn.bmp → non_text/img/en/source/mmmerge/c_dft_dn.bmp
diff --git a/non_text/img/en_merge_source/c_dft_ht.bmp → non_text/img/en/source/mmmerge/c_dft_ht.bmp b/non_text/img/en_merge_source/c_dft_ht.bmp → non_text/img/en/source/mmmerge/c_dft_ht.bmp
diff --git a/non_text/img/en_merge_source/c_dft_up.bmp → non_text/img/en/source/mmmerge/c_dft_up.bmp b/non_text/img/en_merge_source/c_dft_up.bmp → non_text/img/en/source/mmmerge/c_dft_up.bmp
diff --git a/non_text/img/en_merge_source/c_ext_dn.bmp → non_text/img/en/source/mmmerge/c_ext_dn.bmp b/non_text/img/en_merge_source/c_ext_dn.bmp → non_text/img/en/source/mmmerge/c_ext_dn.bmp
diff --git a/non_text/img/en_merge_source/c_ext_ht.bmp → non_text/img/en/source/mmmerge/c_ext_ht.bmp b/non_text/img/en_merge_source/c_ext_ht.bmp → non_text/img/en/source/mmmerge/c_ext_ht.bmp
diff --git a/non_text/img/en_merge_source/c_ext_up.bmp → non_text/img/en/source/mmmerge/c_ext_up.bmp b/non_text/img/en_merge_source/c_ext_up.bmp → non_text/img/en/source/mmmerge/c_ext_up.bmp
diff --git a/non_text/img/en_merge_source/c_ok_dn.bmp → non_text/img/en/source/mmmerge/c_ok_dn.bmp b/non_text/img/en_merge_source/c_ok_dn.bmp → non_text/img/en/source/mmmerge/c_ok_dn.bmp
diff --git a/non_text/img/en_merge_source/c_ok_ht.bmp → non_text/img/en/source/mmmerge/c_ok_ht.bmp b/non_text/img/en_merge_source/c_ok_ht.bmp → non_text/img/en/source/mmmerge/c_ok_ht.bmp
diff --git a/non_text/img/en_merge_source/c_ok_up.bmp → non_text/img/en/source/mmmerge/c_ok_up.bmp b/non_text/img/en_merge_source/c_ok_up.bmp → non_text/img/en/source/mmmerge/c_ok_up.bmp
diff --git a/non_text/img/en_merge_source/controlbg.bmp → non_text/img/en/source/mmmerge/controlbg.bmp b/non_text/img/en_merge_source/controlbg.bmp → non_text/img/en/source/mmmerge/controlbg.bmp
diff --git a/non_text/img/en_merge_source/makeme.pcx → non_text/img/en/source/mmmerge/makeme.pcx b/non_text/img/en_merge_source/makeme.pcx → non_text/img/en/source/mmmerge/makeme.pcx
diff --git a/non_text/img/en_merge_source/mm6title.pcx → non_text/img/en/source/mmmerge/mm6title.pcx b/non_text/img/en_merge_source/mm6title.pcx → non_text/img/en/source/mmmerge/mm6title.pcx
diff --git a/non_text/img/en_merge_source/optkb.bmp → non_text/img/en/source/mmmerge/optkb.bmp b/non_text/img/en_merge_source/optkb.bmp → non_text/img/en/source/mmmerge/optkb.bmp
diff --git a/non_text/img/en_merge_source/optvid.bmp → non_text/img/en/source/mmmerge/optvid.bmp b/non_text/img/en_merge_source/optvid.bmp → non_text/img/en/source/mmmerge/optvid.bmp
diff --git a/non_text/img/en_merge_source/restmain.bmp → non_text/img/en/source/mmmerge/restmain.bmp b/non_text/img/en_merge_source/restmain.bmp → non_text/img/en/source/mmmerge/restmain.bmp
diff --git a/non_text/img/en_merge_source/sba000.bmp → non_text/img/en/source/mmmerge/sba000.bmp b/non_text/img/en_merge_source/sba000.bmp → non_text/img/en/source/mmmerge/sba000.bmp
diff --git a/non_text/img/en_merge_source/sba000a.bmp → non_text/img/en/source/mmmerge/sba000a.bmp b/non_text/img/en_merge_source/sba000a.bmp → non_text/img/en/source/mmmerge/sba000a.bmp
diff --git a/non_text/img/en_merge_source/sbb000.bmp → non_text/img/en/source/mmmerge/sbb000.bmp b/non_text/img/en_merge_source/sbb000.bmp → non_text/img/en/source/mmmerge/sbb000.bmp
diff --git a/non_text/img/en_merge_source/sbb000a.bmp → non_text/img/en/source/mmmerge/sbb000a.bmp b/non_text/img/en_merge_source/sbb000a.bmp → non_text/img/en/source/mmmerge/sbb000a.bmp
diff --git a/non_text/img/en_merge_source/sbd000.bmp → non_text/img/en/source/mmmerge/sbd000.bmp b/non_text/img/en_merge_source/sbd000.bmp → non_text/img/en/source/mmmerge/sbd000.bmp
diff --git a/non_text/img/en_merge_source/sbd000a.bmp → non_text/img/en/source/mmmerge/sbd000a.bmp b/non_text/img/en_merge_source/sbd000a.bmp → non_text/img/en/source/mmmerge/sbd000a.bmp
diff --git a/non_text/img/en_merge_source/sbde000.bmp → non_text/img/en/source/mmmerge/sbde000.bmp b/non_text/img/en_merge_source/sbde000.bmp → non_text/img/en/source/mmmerge/sbde000.bmp
diff --git a/non_text/img/en_merge_source/sbde000a.bmp → non_text/img/en/source/mmmerge/sbde000a.bmp b/non_text/img/en_merge_source/sbde000a.bmp → non_text/img/en/source/mmmerge/sbde000a.bmp
diff --git a/non_text/img/en_merge_source/sbdk000.bmp → non_text/img/en/source/mmmerge/sbdk000.bmp b/non_text/img/en_merge_source/sbdk000.bmp → non_text/img/en/source/mmmerge/sbdk000.bmp
diff --git a/non_text/img/en_merge_source/sbdk000a.bmp → non_text/img/en/source/mmmerge/sbdk000a.bmp b/non_text/img/en_merge_source/sbdk000a.bmp → non_text/img/en/source/mmmerge/sbdk000a.bmp
diff --git a/non_text/img/en_merge_source/sbe000.bmp → non_text/img/en/source/mmmerge/sbe000.bmp b/non_text/img/en_merge_source/sbe000.bmp → non_text/img/en/source/mmmerge/sbe000.bmp
diff --git a/non_text/img/en_merge_source/sbe000a.bmp → non_text/img/en/source/mmmerge/sbe000a.bmp b/non_text/img/en_merge_source/sbe000a.bmp → non_text/img/en/source/mmmerge/sbe000a.bmp
diff --git a/non_text/img/en_merge_source/sbf000.bmp → non_text/img/en/source/mmmerge/sbf000.bmp b/non_text/img/en_merge_source/sbf000.bmp → non_text/img/en/source/mmmerge/sbf000.bmp
diff --git a/non_text/img/en_merge_source/sbf000a.bmp → non_text/img/en/source/mmmerge/sbf000a.bmp b/non_text/img/en_merge_source/sbf000a.bmp → non_text/img/en/source/mmmerge/sbf000a.bmp
diff --git a/non_text/img/en_merge_source/sbl000.bmp → non_text/img/en/source/mmmerge/sbl000.bmp b/non_text/img/en_merge_source/sbl000.bmp → non_text/img/en/source/mmmerge/sbl000.bmp
diff --git a/non_text/img/en_merge_source/sbl000a.bmp → non_text/img/en/source/mmmerge/sbl000a.bmp b/non_text/img/en_merge_source/sbl000a.bmp → non_text/img/en/source/mmmerge/sbl000a.bmp
diff --git a/non_text/img/en_merge_source/sbm000.bmp → non_text/img/en/source/mmmerge/sbm000.bmp b/non_text/img/en_merge_source/sbm000.bmp → non_text/img/en/source/mmmerge/sbm000.bmp
diff --git a/non_text/img/en_merge_source/sbm000a.bmp → non_text/img/en/source/mmmerge/sbm000a.bmp b/non_text/img/en_merge_source/sbm000a.bmp → non_text/img/en/source/mmmerge/sbm000a.bmp
diff --git a/non_text/img/en_merge_source/sbs000.bmp → non_text/img/en/source/mmmerge/sbs000.bmp b/non_text/img/en_merge_source/sbs000.bmp → non_text/img/en/source/mmmerge/sbs000.bmp
diff --git a/non_text/img/en_merge_source/sbs000a.bmp → non_text/img/en/source/mmmerge/sbs000a.bmp b/non_text/img/en_merge_source/sbs000a.bmp → non_text/img/en/source/mmmerge/sbs000a.bmp
diff --git a/non_text/img/en_merge_source/sbv000.bmp → non_text/img/en/source/mmmerge/sbv000.bmp b/non_text/img/en_merge_source/sbv000.bmp → non_text/img/en/source/mmmerge/sbv000.bmp
diff --git a/non_text/img/en_merge_source/sbv000a.bmp → non_text/img/en/source/mmmerge/sbv000a.bmp b/non_text/img/en_merge_source/sbv000a.bmp → non_text/img/en/source/mmmerge/sbv000a.bmp
diff --git a/non_text/img/en_merge_source/sbw000.bmp → non_text/img/en/source/mmmerge/sbw000.bmp b/non_text/img/en_merge_source/sbw000.bmp → non_text/img/en/source/mmmerge/sbw000.bmp
diff --git a/non_text/img/en_merge_source/sbw000a.bmp → non_text/img/en/source/mmmerge/sbw000a.bmp b/non_text/img/en_merge_source/sbw000a.bmp → non_text/img/en/source/mmmerge/sbw000a.bmp
diff --git a/non_text/img/en_merge_source/sprites.pcx → non_text/img/en/source/mmmerge/sprites.pcx b/non_text/img/en_merge_source/sprites.pcx → non_text/img/en/source/mmmerge/sprites.pcx
diff --git a/non_text/img/en_merge_source/winbg.pcx → non_text/img/en/source/mmmerge/winbg.pcx b/non_text/img/en_merge_source/winbg.pcx → non_text/img/en/source/mmmerge/winbg.pcx
diff --git a/non_text/img/en_merge_source/winbg2.pcx → non_text/img/en/source/mmmerge/winbg2.pcx b/non_text/img/en_merge_source/winbg2.pcx → non_text/img/en/source/mmmerge/winbg2.pcx
diff --git a/non_text/img/en_merge_source/winbg_old.pcx → non_text/img/en/source/mmmerge/winbg_old.pcx b/non_text/img/en_merge_source/winbg_old.pcx → non_text/img/en/source/mmmerge/winbg_old.pcx
diff --git a/non_text/img/Arcomage/sprites.bmp → non_text/img/zh_CN/dev/Arcomage/sprites.bmp b/non_text/img/Arcomage/sprites.bmp → non_text/img/zh_CN/dev/Arcomage/sprites.bmp
diff --git a/non_text/img/Arcomage/sprites.pcx → non_text/img/zh_CN/dev/Arcomage/sprites.pcx b/non_text/img/Arcomage/sprites.pcx → non_text/img/zh_CN/dev/Arcomage/sprites.pcx
diff --git a/non_text/img/zh_CN/dev/mm6/COMPASS.fw.png b/non_text/img/zh_CN/dev/mm6/COMPASS.fw.png
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_16x.bmp b/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_16x.bmp
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_32x.bmp b/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_32x.bmp
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_high.bmp b/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_high.bmp
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_low.bmp b/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_low.bmp
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_med.bmp b/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_med.bmp
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_smoo.bmp b/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_smoo.bmp
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_x.bmp b/non_text/img/zh_CN/dev/mm6/conbmpFIX/con_x.bmp
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/controlbg.bmp b/non_text/img/zh_CN/dev/mm6/conbmpFIX/controlbg.bmp
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/Checkmark_green.svg b/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/Checkmark_green.svg
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/bitmap.png b/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/bitmap.png
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_high.fw.png b/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_high.fw.png
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_low.fw.png b/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_low.fw.png
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_med.fw.png b/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_med.fw.png
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_smoo.fw.png b/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_smoo.fw.png
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_x.fw.png b/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/con_x.fw.png
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/controlbg.fw.png b/non_text/img/zh_CN/dev/mm6/conbmpFIX/fwpng/controlbg.fw.png
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/screenshot/2017-06-07_233933.jpg b/non_text/img/zh_CN/dev/mm6/conbmpFIX/screenshot/2017-06-07_233933.jpg
diff --git a/non_text/img/zh_CN/dev/mm6/conbmpFIX/screenshot/2017-06-07_234154.jpg b/non_text/img/zh_CN/dev/mm6/conbmpFIX/screenshot/2017-06-07_234154.jpg
diff --git a/...text/img/mm6-portraits-fix/fix/NPC037.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC037.bmp b/...text/img/mm6-portraits-fix/fix/NPC037.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC037.bmp
diff --git a/...text/img/mm6-portraits-fix/fix/NPC038.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC038.bmp b/...text/img/mm6-portraits-fix/fix/NPC038.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC038.bmp
diff --git a/...text/img/mm6-portraits-fix/fix/NPC045.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC045.bmp b/...text/img/mm6-portraits-fix/fix/NPC045.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC045.bmp
diff --git a/...text/img/mm6-portraits-fix/fix/NPC115.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC115.bmp b/...text/img/mm6-portraits-fix/fix/NPC115.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC115.bmp
diff --git a/...text/img/mm6-portraits-fix/fix/NPC243.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC243.bmp b/...text/img/mm6-portraits-fix/fix/NPC243.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC243.bmp
diff --git a/...text/img/mm6-portraits-fix/fix/NPC252.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC252.bmp b/...text/img/mm6-portraits-fix/fix/NPC252.bmp → ...h_CN/dev/mm6/portraits-fix/fix/NPC252.bmp
diff --git a/...text/img/mm6-portraits-fix/fix/npc624.bmp → ...h_CN/dev/mm6/portraits-fix/fix/npc624.bmp b/...text/img/mm6-portraits-fix/fix/npc624.bmp → ...h_CN/dev/mm6/portraits-fix/fix/npc624.bmp
diff --git a/...img/mm6-portraits-fix/original/NPC037.bmp → ...dev/mm6/portraits-fix/original/NPC037.bmp b/...img/mm6-portraits-fix/original/NPC037.bmp → ...dev/mm6/portraits-fix/original/NPC037.bmp
diff --git a/...img/mm6-portraits-fix/original/NPC038.bmp → ...dev/mm6/portraits-fix/original/NPC038.bmp b/...img/mm6-portraits-fix/original/NPC038.bmp → ...dev/mm6/portraits-fix/original/NPC038.bmp
diff --git a/...img/mm6-portraits-fix/original/NPC045.bmp → ...dev/mm6/portraits-fix/original/NPC045.bmp b/...img/mm6-portraits-fix/original/NPC045.bmp → ...dev/mm6/portraits-fix/original/NPC045.bmp
diff --git a/...img/mm6-portraits-fix/original/NPC115.bmp → ...dev/mm6/portraits-fix/original/NPC115.bmp b/...img/mm6-portraits-fix/original/NPC115.bmp → ...dev/mm6/portraits-fix/original/NPC115.bmp
diff --git a/...img/mm6-portraits-fix/original/NPC243.bmp → ...dev/mm6/portraits-fix/original/NPC243.bmp b/...img/mm6-portraits-fix/original/NPC243.bmp → ...dev/mm6/portraits-fix/original/NPC243.bmp
diff --git a/...img/mm6-portraits-fix/original/NPC252.bmp → ...dev/mm6/portraits-fix/original/NPC252.bmp b/...img/mm6-portraits-fix/original/NPC252.bmp → ...dev/mm6/portraits-fix/original/NPC252.bmp
diff --git a/...img/mm6-portraits-fix/original/npc624.bmp → ...dev/mm6/portraits-fix/original/npc624.bmp b/...img/mm6-portraits-fix/original/npc624.bmp → ...dev/mm6/portraits-fix/original/npc624.bmp
diff --git a/...-related-images/unchanged/townport.fw.png → non_text/img/zh_CN/dev/mm6/townport.fw.png b/...-related-images/unchanged/townport.fw.png → non_text/img/zh_CN/dev/mm6/townport.fw.png
diff --git a/...t/img/trans/controlbg/dev/Lsave640.fw.png → ...rge_and_mm8/controlbg/dev/Lsave640.fw.png b/...t/img/trans/controlbg/dev/Lsave640.fw.png → ...rge_and_mm8/controlbg/dev/Lsave640.fw.png
diff --git a/...xt/img/trans/controlbg/dev/Options.fw.png → ...erge_and_mm8/controlbg/dev/Options.fw.png b/...xt/img/trans/controlbg/dev/Options.fw.png → ...erge_and_mm8/controlbg/dev/Options.fw.png
diff --git a/.../img/trans/controlbg/dev/controlbg.fw.png → ...ge_and_mm8/controlbg/dev/controlbg.fw.png b/.../img/trans/controlbg/dev/controlbg.fw.png → ...ge_and_mm8/controlbg/dev/controlbg.fw.png
diff --git a/non_text/img/trans/controlbg/dev/makeme.bmp → .../mmmerge_and_mm8/controlbg/dev/makeme.bmp b/non_text/img/trans/controlbg/dev/makeme.bmp → .../mmmerge_and_mm8/controlbg/dev/makeme.bmp
diff --git a/...ext/img/trans/controlbg/dev/makeme.fw.png → ...merge_and_mm8/controlbg/dev/makeme.fw.png b/...ext/img/trans/controlbg/dev/makeme.fw.png → ...merge_and_mm8/controlbg/dev/makeme.fw.png
diff --git a/...text/img/trans/controlbg/dev/optkb.fw.png → ...mmerge_and_mm8/controlbg/dev/optkb.fw.png b/...text/img/trans/controlbg/dev/optkb.fw.png → ...mmerge_and_mm8/controlbg/dev/optkb.fw.png
diff --git a/...ext/img/trans/controlbg/dev/optvid.fw.png → ...merge_and_mm8/controlbg/dev/optvid.fw.png b/...ext/img/trans/controlbg/dev/optvid.fw.png → ...merge_and_mm8/controlbg/dev/optvid.fw.png
diff --git a/...img/trans/controlbg/original/Lsave640.bmp → ...e_and_mm8/controlbg/original/Lsave640.bmp b/...img/trans/controlbg/original/Lsave640.bmp → ...e_and_mm8/controlbg/original/Lsave640.bmp
diff --git a/.../img/trans/controlbg/original/Options.bmp → ...ge_and_mm8/controlbg/original/Options.bmp b/.../img/trans/controlbg/original/Options.bmp → ...ge_and_mm8/controlbg/original/Options.bmp
diff --git a/...mg/trans/controlbg/original/controlbg.bmp → ..._and_mm8/controlbg/original/controlbg.bmp b/...mg/trans/controlbg/original/controlbg.bmp → ..._and_mm8/controlbg/original/controlbg.bmp
diff --git a/...t/img/trans/controlbg/original/makeme.pcx → ...rge_and_mm8/controlbg/original/makeme.pcx b/...t/img/trans/controlbg/original/makeme.pcx → ...rge_and_mm8/controlbg/original/makeme.pcx
diff --git a/...xt/img/trans/controlbg/original/optkb.bmp → ...erge_and_mm8/controlbg/original/optkb.bmp b/...xt/img/trans/controlbg/original/optkb.bmp → ...erge_and_mm8/controlbg/original/optkb.bmp
diff --git a/...t/img/trans/controlbg/original/optvid.bmp → ...rge_and_mm8/controlbg/original/optvid.bmp b/...t/img/trans/controlbg/original/optvid.bmp → ...rge_and_mm8/controlbg/original/optvid.bmp
diff --git a/...ext/img/trans/controlbg/prod/Lsave640.bmp → ...merge_and_mm8/controlbg/prod/Lsave640.bmp b/...ext/img/trans/controlbg/prod/Lsave640.bmp → ...merge_and_mm8/controlbg/prod/Lsave640.bmp
diff --git a/...text/img/trans/controlbg/prod/Options.bmp → ...mmerge_and_mm8/controlbg/prod/Options.bmp b/...text/img/trans/controlbg/prod/Options.bmp → ...mmerge_and_mm8/controlbg/prod/Options.bmp
diff --git a/...xt/img/trans/controlbg/prod/controlbg.bmp → ...erge_and_mm8/controlbg/prod/controlbg.bmp b/...xt/img/trans/controlbg/prod/controlbg.bmp → ...erge_and_mm8/controlbg/prod/controlbg.bmp
diff --git a/non_text/img/trans/controlbg/prod/makeme.pcx → ...mmmerge_and_mm8/controlbg/prod/makeme.pcx b/non_text/img/trans/controlbg/prod/makeme.pcx → ...mmmerge_and_mm8/controlbg/prod/makeme.pcx
diff --git a/non_text/img/trans/controlbg/prod/optkb.bmp → .../mmmerge_and_mm8/controlbg/prod/optkb.bmp b/non_text/img/trans/controlbg/prod/optkb.bmp → .../mmmerge_and_mm8/controlbg/prod/optkb.bmp
diff --git a/non_text/img/trans/controlbg/prod/optvid.bmp → ...mmmerge_and_mm8/controlbg/prod/optvid.bmp b/non_text/img/trans/controlbg/prod/optvid.bmp → ...mmmerge_and_mm8/controlbg/prod/optvid.bmp
diff --git a/non_text/img/trans/controlbutton/dev/bg.png → .../mmmerge_and_mm8/controlbutton/dev/bg.png b/non_text/img/trans/controlbutton/dev/bg.png → .../mmmerge_and_mm8/controlbutton/dev/bg.png
diff --git a/...g/trans/controlbutton/dev/bt_contD.fw.png → ...and_mm8/controlbutton/dev/bt_contD.fw.png b/...g/trans/controlbutton/dev/bt_contD.fw.png → ...and_mm8/controlbutton/dev/bt_contD.fw.png
diff --git a/...g/trans/controlbutton/dev/bt_contH.fw.png → ...and_mm8/controlbutton/dev/bt_contH.fw.png b/...g/trans/controlbutton/dev/bt_contH.fw.png → ...and_mm8/controlbutton/dev/bt_contH.fw.png
diff --git a/...g/trans/controlbutton/dev/bt_contU.fw.png → ...and_mm8/controlbutton/dev/bt_contU.fw.png b/...g/trans/controlbutton/dev/bt_contU.fw.png → ...and_mm8/controlbutton/dev/bt_contU.fw.png
diff --git a/...g/trans/controlbutton/dev/bt_quitD.fw.png → ...and_mm8/controlbutton/dev/bt_quitD.fw.png b/...g/trans/controlbutton/dev/bt_quitD.fw.png → ...and_mm8/controlbutton/dev/bt_quitD.fw.png
diff --git a/...g/trans/controlbutton/dev/bt_quitH.fw.png → ...and_mm8/controlbutton/dev/bt_quitH.fw.png b/...g/trans/controlbutton/dev/bt_quitH.fw.png → ...and_mm8/controlbutton/dev/bt_quitH.fw.png
diff --git a/...g/trans/controlbutton/dev/bt_quitU.fw.png → ...and_mm8/controlbutton/dev/bt_quitU.fw.png b/...g/trans/controlbutton/dev/bt_quitU.fw.png → ...and_mm8/controlbutton/dev/bt_quitU.fw.png
diff --git a/...g/trans/controlbutton/dev/bu_rtrnD.fw.png → ...and_mm8/controlbutton/dev/bu_rtrnD.fw.png b/...g/trans/controlbutton/dev/bu_rtrnD.fw.png → ...and_mm8/controlbutton/dev/bu_rtrnD.fw.png
diff --git a/...g/trans/controlbutton/dev/bu_rtrnH.fw.png → ...and_mm8/controlbutton/dev/bu_rtrnH.fw.png b/...g/trans/controlbutton/dev/bu_rtrnH.fw.png → ...and_mm8/controlbutton/dev/bu_rtrnH.fw.png
diff --git a/...g/trans/controlbutton/dev/bu_rtrnU.fw.png → ...and_mm8/controlbutton/dev/bu_rtrnU.fw.png b/...g/trans/controlbutton/dev/bu_rtrnU.fw.png → ...and_mm8/controlbutton/dev/bu_rtrnU.fw.png
diff --git a/...trans/controlbutton/original/bt_contD.bmp → ...d_mm8/controlbutton/original/bt_contD.bmp b/...trans/controlbutton/original/bt_contD.bmp → ...d_mm8/controlbutton/original/bt_contD.bmp
diff --git a/...trans/controlbutton/original/bt_contH.bmp → ...d_mm8/controlbutton/original/bt_contH.bmp b/...trans/controlbutton/original/bt_contH.bmp → ...d_mm8/controlbutton/original/bt_contH.bmp
diff --git a/...trans/controlbutton/original/bt_contU.bmp → ...d_mm8/controlbutton/original/bt_contU.bmp b/...trans/controlbutton/original/bt_contU.bmp → ...d_mm8/controlbutton/original/bt_contU.bmp
diff --git a/...trans/controlbutton/original/bt_quitD.bmp → ...d_mm8/controlbutton/original/bt_quitD.bmp b/...trans/controlbutton/original/bt_quitD.bmp → ...d_mm8/controlbutton/original/bt_quitD.bmp
diff --git a/...trans/controlbutton/original/bt_quitH.bmp → ...d_mm8/controlbutton/original/bt_quitH.bmp b/...trans/controlbutton/original/bt_quitH.bmp → ...d_mm8/controlbutton/original/bt_quitH.bmp
diff --git a/...trans/controlbutton/original/bt_quitU.bmp → ...d_mm8/controlbutton/original/bt_quitU.bmp b/...trans/controlbutton/original/bt_quitU.bmp → ...d_mm8/controlbutton/original/bt_quitU.bmp
diff --git a/...trans/controlbutton/original/bu_rtrnD.bmp → ...d_mm8/controlbutton/original/bu_rtrnD.bmp b/...trans/controlbutton/original/bu_rtrnD.bmp → ...d_mm8/controlbutton/original/bu_rtrnD.bmp
diff --git a/...trans/controlbutton/original/bu_rtrnH.bmp → ...d_mm8/controlbutton/original/bu_rtrnH.bmp b/...trans/controlbutton/original/bu_rtrnH.bmp → ...d_mm8/controlbutton/original/bu_rtrnH.bmp
diff --git a/...trans/controlbutton/original/bu_rtrnU.bmp → ...d_mm8/controlbutton/original/bu_rtrnU.bmp b/...trans/controlbutton/original/bu_rtrnU.bmp → ...d_mm8/controlbutton/original/bu_rtrnU.bmp
diff --git a/...img/trans/controlbutton/prod/bt_contD.bmp → ...e_and_mm8/controlbutton/prod/bt_contD.bmp b/...img/trans/controlbutton/prod/bt_contD.bmp → ...e_and_mm8/controlbutton/prod/bt_contD.bmp
diff --git a/...img/trans/controlbutton/prod/bt_contH.bmp → ...e_and_mm8/controlbutton/prod/bt_contH.bmp b/...img/trans/controlbutton/prod/bt_contH.bmp → ...e_and_mm8/controlbutton/prod/bt_contH.bmp
diff --git a/...img/trans/controlbutton/prod/bt_contU.bmp → ...e_and_mm8/controlbutton/prod/bt_contU.bmp b/...img/trans/controlbutton/prod/bt_contU.bmp → ...e_and_mm8/controlbutton/prod/bt_contU.bmp
diff --git a/...img/trans/controlbutton/prod/bt_quitD.bmp → ...e_and_mm8/controlbutton/prod/bt_quitD.bmp b/...img/trans/controlbutton/prod/bt_quitD.bmp → ...e_and_mm8/controlbutton/prod/bt_quitD.bmp
diff --git a/...img/trans/controlbutton/prod/bt_quitH.bmp → ...e_and_mm8/controlbutton/prod/bt_quitH.bmp b/...img/trans/controlbutton/prod/bt_quitH.bmp → ...e_and_mm8/controlbutton/prod/bt_quitH.bmp
diff --git a/...img/trans/controlbutton/prod/bt_quitU.bmp → ...e_and_mm8/controlbutton/prod/bt_quitU.bmp b/...img/trans/controlbutton/prod/bt_quitU.bmp → ...e_and_mm8/controlbutton/prod/bt_quitU.bmp
diff --git a/...img/trans/controlbutton/prod/bu_rtrnD.bmp → ...e_and_mm8/controlbutton/prod/bu_rtrnD.bmp b/...img/trans/controlbutton/prod/bu_rtrnD.bmp → ...e_and_mm8/controlbutton/prod/bu_rtrnD.bmp
diff --git a/...img/trans/controlbutton/prod/bu_rtrnH.bmp → ...e_and_mm8/controlbutton/prod/bu_rtrnH.bmp b/...img/trans/controlbutton/prod/bu_rtrnH.bmp → ...e_and_mm8/controlbutton/prod/bu_rtrnH.bmp
diff --git a/...img/trans/controlbutton/prod/bu_rtrnU.bmp → ...e_and_mm8/controlbutton/prod/bu_rtrnU.bmp b/...img/trans/controlbutton/prod/bu_rtrnU.bmp → ...e_and_mm8/controlbutton/prod/bu_rtrnU.bmp
diff --git a/.../trans/controlbuttonsmall/dev/bgsmall.png → ...nd_mm8/controlbuttonsmall/dev/bgsmall.png b/.../trans/controlbuttonsmall/dev/bgsmall.png → ...nd_mm8/controlbuttonsmall/dev/bgsmall.png
diff --git a/...ns/controlbuttonsmall/dev/bt_flipD.fw.png → ...m8/controlbuttonsmall/dev/bt_flipD.fw.png b/...ns/controlbuttonsmall/dev/bt_flipD.fw.png → ...m8/controlbuttonsmall/dev/bt_flipD.fw.png
diff --git a/...ns/controlbuttonsmall/dev/bt_flipU.fw.png → ...m8/controlbuttonsmall/dev/bt_flipU.fw.png b/...ns/controlbuttonsmall/dev/bt_flipU.fw.png → ...m8/controlbuttonsmall/dev/bt_flipU.fw.png