Change the folder name from Docs/Manual/EN to Docs/Manual/English, and from Docs...

diff --git a/Docs/Manual/EN/About_Doc.xml b/Docs/Manual/English/About_Doc.xml
similarity index 100%
rename from Docs/Manual/EN/About_Doc.xml
rename to Docs/Manual/English/About_Doc.xml

diff --git a/Docs/Manual/EN/Command_line.xml b/Docs/Manual/English/Command_line.xml
similarity index 100%
rename from Docs/Manual/EN/Command_line.xml
rename to Docs/Manual/English/Command_line.xml

diff --git a/Docs/Manual/EN/Compare_bin.xml b/Docs/Manual/English/Compare_bin.xml
similarity index 100%
rename from Docs/Manual/EN/Compare_bin.xml
rename to Docs/Manual/English/Compare_bin.xml

diff --git a/Docs/Manual/EN/Compare_dirs.xml b/Docs/Manual/English/Compare_dirs.xml
similarity index 100%
rename from Docs/Manual/EN/Compare_dirs.xml
rename to Docs/Manual/English/Compare_dirs.xml

diff --git a/Docs/Manual/EN/Compare_files.xml b/Docs/Manual/English/Compare_files.xml
similarity index 100%
rename from Docs/Manual/EN/Compare_files.xml
rename to Docs/Manual/English/Compare_files.xml

diff --git a/Docs/Manual/EN/Compare_images.xml b/Docs/Manual/English/Compare_images.xml
similarity index 100%
rename from Docs/Manual/EN/Compare_images.xml
rename to Docs/Manual/English/Compare_images.xml

diff --git a/Docs/Manual/EN/Compare_table.xml b/Docs/Manual/English/Compare_table.xml
similarity index 100%
rename from Docs/Manual/EN/Compare_table.xml
rename to Docs/Manual/English/Compare_table.xml

diff --git a/Docs/Manual/EN/Compare_webpages.xml b/Docs/Manual/English/Compare_webpages.xml
similarity index 100%
rename from Docs/Manual/EN/Compare_webpages.xml
rename to Docs/Manual/English/Compare_webpages.xml

diff --git a/Docs/Manual/EN/Configuration.xml b/Docs/Manual/English/Configuration.xml
similarity index 100%
rename from Docs/Manual/EN/Configuration.xml
rename to Docs/Manual/English/Configuration.xml

diff --git a/Docs/Manual/EN/Faq.xml b/Docs/Manual/English/Faq.xml
similarity index 100%
rename from Docs/Manual/EN/Faq.xml
rename to Docs/Manual/English/Faq.xml

diff --git a/Docs/Manual/EN/Filters.xml b/Docs/Manual/English/Filters.xml
similarity index 100%
rename from Docs/Manual/EN/Filters.xml
rename to Docs/Manual/English/Filters.xml

diff --git a/Docs/Manual/EN/Index.xml b/Docs/Manual/English/Index.xml
similarity index 100%
rename from Docs/Manual/EN/Index.xml
rename to Docs/Manual/English/Index.xml

diff --git a/Docs/Manual/EN/Install.xml b/Docs/Manual/English/Install.xml
similarity index 100%
rename from Docs/Manual/EN/Install.xml
rename to Docs/Manual/English/Install.xml

diff --git a/Docs/Manual/EN/Intro_diffs.xml b/Docs/Manual/English/Intro_diffs.xml
similarity index 100%
rename from Docs/Manual/EN/Intro_diffs.xml
rename to Docs/Manual/English/Intro_diffs.xml

diff --git a/Docs/Manual/EN/Introduction.xml b/Docs/Manual/English/Introduction.xml
similarity index 100%
rename from Docs/Manual/EN/Introduction.xml
rename to Docs/Manual/English/Introduction.xml

diff --git a/Docs/Manual/EN/Locales.xml b/Docs/Manual/English/Locales.xml
similarity index 100%
rename from Docs/Manual/EN/Locales.xml
rename to Docs/Manual/English/Locales.xml

diff --git a/Docs/Manual/EN/Open_paths.xml b/Docs/Manual/English/Open_paths.xml
similarity index 100%
rename from Docs/Manual/EN/Open_paths.xml
rename to Docs/Manual/English/Open_paths.xml

diff --git a/Docs/Manual/EN/Plugins.xml b/Docs/Manual/English/Plugins.xml
similarity index 100%
rename from Docs/Manual/EN/Plugins.xml
rename to Docs/Manual/English/Plugins.xml

diff --git a/Docs/Manual/EN/Quick_start.xml b/Docs/Manual/English/Quick_start.xml
similarity index 100%
rename from Docs/Manual/EN/Quick_start.xml
rename to Docs/Manual/English/Quick_start.xml

diff --git a/Docs/Manual/EN/Shortcut_keys.xml b/Docs/Manual/English/Shortcut_keys.xml
similarity index 100%
rename from Docs/Manual/EN/Shortcut_keys.xml
rename to Docs/Manual/English/Shortcut_keys.xml

diff --git a/Docs/Manual/EN/Version_control.xml b/Docs/Manual/English/Version_control.xml
similarity index 100%
rename from Docs/Manual/EN/Version_control.xml
rename to Docs/Manual/English/Version_control.xml

diff --git a/Docs/Manual/EN/_Copyrights.xml b/Docs/Manual/English/_Copyrights.xml
similarity index 100%
rename from Docs/Manual/EN/_Copyrights.xml
rename to Docs/Manual/English/_Copyrights.xml

diff --git a/Docs/Manual/EN/_VersionNumbers.xml b/Docs/Manual/English/_VersionNumbers.xml
similarity index 100%
rename from Docs/Manual/EN/_VersionNumbers.xml
rename to Docs/Manual/English/_VersionNumbers.xml

diff --git a/Docs/Manual/EN/screenshots/OpenDlg1.png b/Docs/Manual/English/screenshots/OpenDlg1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/OpenDlg1.png
rename to Docs/Manual/English/screenshots/OpenDlg1.png

diff --git a/Docs/Manual/EN/screenshots/aborted.png b/Docs/Manual/English/screenshots/aborted.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/aborted.png
rename to Docs/Manual/English/screenshots/aborted.png

diff --git a/Docs/Manual/EN/screenshots/allleft_btn.png b/Docs/Manual/English/screenshots/allleft_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/allleft_btn.png
rename to Docs/Manual/English/screenshots/allleft_btn.png

diff --git a/Docs/Manual/EN/screenshots/allright_btn.png b/Docs/Manual/English/screenshots/allright_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/allright_btn.png
rename to Docs/Manual/English/screenshots/allright_btn.png

diff --git a/Docs/Manual/EN/screenshots/binary.png b/Docs/Manual/English/screenshots/binary.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/binary.png
rename to Docs/Manual/English/screenshots/binary.png

diff --git a/Docs/Manual/EN/screenshots/binarydiff.png b/Docs/Manual/English/screenshots/binarydiff.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/binarydiff.png
rename to Docs/Manual/English/screenshots/binarydiff.png

diff --git a/Docs/Manual/EN/screenshots/char-diff-01.png b/Docs/Manual/English/screenshots/char-diff-01.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/char-diff-01.png
rename to Docs/Manual/English/screenshots/char-diff-01.png

diff --git a/Docs/Manual/EN/screenshots/copyl_adv_btn.png b/Docs/Manual/English/screenshots/copyl_adv_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/copyl_adv_btn.png
rename to Docs/Manual/English/screenshots/copyl_adv_btn.png

diff --git a/Docs/Manual/EN/screenshots/copyl_button.png b/Docs/Manual/English/screenshots/copyl_button.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/copyl_button.png
rename to Docs/Manual/English/screenshots/copyl_button.png

diff --git a/Docs/Manual/EN/screenshots/copyr_adv_btn.png b/Docs/Manual/English/screenshots/copyr_adv_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/copyr_adv_btn.png
rename to Docs/Manual/English/screenshots/copyr_adv_btn.png

diff --git a/Docs/Manual/EN/screenshots/copyr_button.png b/Docs/Manual/English/screenshots/copyr_button.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/copyr_button.png
rename to Docs/Manual/English/screenshots/copyr_button.png

diff --git a/Docs/Manual/EN/screenshots/ctx_menu_advanced.png b/Docs/Manual/English/screenshots/ctx_menu_advanced.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/ctx_menu_advanced.png
rename to Docs/Manual/English/screenshots/ctx_menu_advanced.png

diff --git a/Docs/Manual/EN/screenshots/ctx_menu_copy1.png b/Docs/Manual/English/screenshots/ctx_menu_copy1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/ctx_menu_copy1.png
rename to Docs/Manual/English/screenshots/ctx_menu_copy1.png

diff --git a/Docs/Manual/EN/screenshots/ctx_menu_copy2.png b/Docs/Manual/English/screenshots/ctx_menu_copy2.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/ctx_menu_copy2.png
rename to Docs/Manual/English/screenshots/ctx_menu_copy2.png

diff --git a/Docs/Manual/EN/screenshots/ctx_menu_simple.png b/Docs/Manual/English/screenshots/ctx_menu_simple.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/ctx_menu_simple.png
rename to Docs/Manual/English/screenshots/ctx_menu_simple.png

diff --git a/Docs/Manual/EN/screenshots/currentdiff_btn.png b/Docs/Manual/English/screenshots/currentdiff_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/currentdiff_btn.png
rename to Docs/Manual/English/screenshots/currentdiff_btn.png

diff --git a/Docs/Manual/EN/screenshots/diff-blocks-01.png b/Docs/Manual/English/screenshots/diff-blocks-01.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/diff-blocks-01.png
rename to Docs/Manual/English/screenshots/diff-blocks-01.png

diff --git a/Docs/Manual/EN/screenshots/diff_inline_btn.png b/Docs/Manual/English/screenshots/diff_inline_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/diff_inline_btn.png
rename to Docs/Manual/English/screenshots/diff_inline_btn.png

diff --git a/Docs/Manual/EN/screenshots/equal.png b/Docs/Manual/English/screenshots/equal.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/equal.png
rename to Docs/Manual/English/screenshots/equal.png

diff --git a/Docs/Manual/EN/screenshots/equaltextfile.png b/Docs/Manual/English/screenshots/equaltextfile.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/equaltextfile.png
rename to Docs/Manual/English/screenshots/equaltextfile.png

diff --git a/Docs/Manual/EN/screenshots/error.png b/Docs/Manual/English/screenshots/error.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/error.png
rename to Docs/Manual/English/screenshots/error.png

diff --git a/Docs/Manual/EN/screenshots/file_headerbar1.png b/Docs/Manual/English/screenshots/file_headerbar1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/file_headerbar1.png
rename to Docs/Manual/English/screenshots/file_headerbar1.png

diff --git a/Docs/Manual/EN/screenshots/filecomp1.png b/Docs/Manual/English/screenshots/filecomp1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/filecomp1.png
rename to Docs/Manual/English/screenshots/filecomp1.png

diff --git a/Docs/Manual/EN/screenshots/filecomp_context1.png b/Docs/Manual/English/screenshots/filecomp_context1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/filecomp_context1.png
rename to Docs/Manual/English/screenshots/filecomp_context1.png

diff --git a/Docs/Manual/EN/screenshots/filecomp_diffpane1.png b/Docs/Manual/English/screenshots/filecomp_diffpane1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/filecomp_diffpane1.png
rename to Docs/Manual/English/screenshots/filecomp_diffpane1.png

diff --git a/Docs/Manual/EN/screenshots/filecomp_inlinediff.png b/Docs/Manual/English/screenshots/filecomp_inlinediff.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/filecomp_inlinediff.png
rename to Docs/Manual/English/screenshots/filecomp_inlinediff.png

diff --git a/Docs/Manual/EN/screenshots/filecomp_margin1.png b/Docs/Manual/English/screenshots/filecomp_margin1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/filecomp_margin1.png
rename to Docs/Manual/English/screenshots/filecomp_margin1.png

diff --git a/Docs/Manual/EN/screenshots/filecomp_margin2.png b/Docs/Manual/English/screenshots/filecomp_margin2.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/filecomp_margin2.png
rename to Docs/Manual/English/screenshots/filecomp_margin2.png

diff --git a/Docs/Manual/EN/screenshots/filemerged1.png b/Docs/Manual/English/screenshots/filemerged1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/filemerged1.png
rename to Docs/Manual/English/screenshots/filemerged1.png

diff --git a/Docs/Manual/EN/screenshots/fileskip.png b/Docs/Manual/English/screenshots/fileskip.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/fileskip.png
rename to Docs/Manual/English/screenshots/fileskip.png

diff --git a/Docs/Manual/EN/screenshots/firstdiff_btn.png b/Docs/Manual/English/screenshots/firstdiff_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/firstdiff_btn.png
rename to Docs/Manual/English/screenshots/firstdiff_btn.png

diff --git a/Docs/Manual/EN/screenshots/foldercmp_progress.png b/Docs/Manual/English/screenshots/foldercmp_progress.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/foldercmp_progress.png
rename to Docs/Manual/English/screenshots/foldercmp_progress.png

diff --git a/Docs/Manual/EN/screenshots/foldercmp_unique1.png b/Docs/Manual/English/screenshots/foldercmp_unique1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/foldercmp_unique1.png
rename to Docs/Manual/English/screenshots/foldercmp_unique1.png

diff --git a/Docs/Manual/EN/screenshots/foldercmp_unique2.png b/Docs/Manual/English/screenshots/foldercmp_unique2.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/foldercmp_unique2.png
rename to Docs/Manual/English/screenshots/foldercmp_unique2.png

diff --git a/Docs/Manual/EN/screenshots/foldercomp1.png b/Docs/Manual/English/screenshots/foldercomp1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/foldercomp1.png
rename to Docs/Manual/English/screenshots/foldercomp1.png

diff --git a/Docs/Manual/EN/screenshots/foldercomp_2same.png b/Docs/Manual/English/screenshots/foldercomp_2same.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/foldercomp_2same.png
rename to Docs/Manual/English/screenshots/foldercomp_2same.png

diff --git a/Docs/Manual/EN/screenshots/folderdiff.png b/Docs/Manual/English/screenshots/folderdiff.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/folderdiff.png
rename to Docs/Manual/English/screenshots/folderdiff.png

diff --git a/Docs/Manual/EN/screenshots/foldersame.png b/Docs/Manual/English/screenshots/foldersame.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/foldersame.png
rename to Docs/Manual/English/screenshots/foldersame.png

diff --git a/Docs/Manual/EN/screenshots/folderskip.png b/Docs/Manual/English/screenshots/folderskip.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/folderskip.png
rename to Docs/Manual/English/screenshots/folderskip.png

diff --git a/Docs/Manual/EN/screenshots/folderup.png b/Docs/Manual/English/screenshots/folderup.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/folderup.png
rename to Docs/Manual/English/screenshots/folderup.png

diff --git a/Docs/Manual/EN/screenshots/folderup_disable.png b/Docs/Manual/English/screenshots/folderup_disable.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/folderup_disable.png
rename to Docs/Manual/English/screenshots/folderup_disable.png

diff --git a/Docs/Manual/EN/screenshots/hexcmp1.png b/Docs/Manual/English/screenshots/hexcmp1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/hexcmp1.png
rename to Docs/Manual/English/screenshots/hexcmp1.png

diff --git a/Docs/Manual/EN/screenshots/ignore-blank-lines.png b/Docs/Manual/English/screenshots/ignore-blank-lines.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/ignore-blank-lines.png
rename to Docs/Manual/English/screenshots/ignore-blank-lines.png

diff --git a/Docs/Manual/EN/screenshots/imgcmp1.png b/Docs/Manual/English/screenshots/imgcmp1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/imgcmp1.png
rename to Docs/Manual/English/screenshots/imgcmp1.png

diff --git a/Docs/Manual/EN/screenshots/lastdiff_btn.png b/Docs/Manual/English/screenshots/lastdiff_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/lastdiff_btn.png
rename to Docs/Manual/English/screenshots/lastdiff_btn.png

diff --git a/Docs/Manual/EN/screenshots/lfile.png b/Docs/Manual/English/screenshots/lfile.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/lfile.png
rename to Docs/Manual/English/screenshots/lfile.png

diff --git a/Docs/Manual/EN/screenshots/lfolder.png b/Docs/Manual/English/screenshots/lfolder.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/lfolder.png
rename to Docs/Manual/English/screenshots/lfolder.png

diff --git a/Docs/Manual/EN/screenshots/line-diff-punctuation.png b/Docs/Manual/English/screenshots/line-diff-punctuation.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/line-diff-punctuation.png
rename to Docs/Manual/English/screenshots/line-diff-punctuation.png

diff --git a/Docs/Manual/EN/screenshots/linediff.png b/Docs/Manual/English/screenshots/linediff.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/linediff.png
rename to Docs/Manual/English/screenshots/linediff.png

diff --git a/Docs/Manual/EN/screenshots/locpane_currentdiff.png b/Docs/Manual/English/screenshots/locpane_currentdiff.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/locpane_currentdiff.png
rename to Docs/Manual/English/screenshots/locpane_currentdiff.png

diff --git a/Docs/Manual/EN/screenshots/locpane_diffs.png b/Docs/Manual/English/screenshots/locpane_diffs.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/locpane_diffs.png
rename to Docs/Manual/English/screenshots/locpane_diffs.png

diff --git a/Docs/Manual/EN/screenshots/locpane_moved_diffs.png b/Docs/Manual/English/screenshots/locpane_moved_diffs.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/locpane_moved_diffs.png
rename to Docs/Manual/English/screenshots/locpane_moved_diffs.png

diff --git a/Docs/Manual/EN/screenshots/locpane_viewbar.png b/Docs/Manual/English/screenshots/locpane_viewbar.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/locpane_viewbar.png
rename to Docs/Manual/English/screenshots/locpane_viewbar.png

diff --git a/Docs/Manual/EN/screenshots/merge_menu.png b/Docs/Manual/English/screenshots/merge_menu.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/merge_menu.png
rename to Docs/Manual/English/screenshots/merge_menu.png

diff --git a/Docs/Manual/EN/screenshots/mfile.png b/Docs/Manual/English/screenshots/mfile.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/mfile.png
rename to Docs/Manual/English/screenshots/mfile.png

diff --git a/Docs/Manual/EN/screenshots/mfolder.png b/Docs/Manual/English/screenshots/mfolder.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/mfolder.png
rename to Docs/Manual/English/screenshots/mfolder.png

diff --git a/Docs/Manual/EN/screenshots/missing_lines.png b/Docs/Manual/English/screenshots/missing_lines.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/missing_lines.png
rename to Docs/Manual/English/screenshots/missing_lines.png

diff --git a/Docs/Manual/EN/screenshots/moved-01.png b/Docs/Manual/English/screenshots/moved-01.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/moved-01.png
rename to Docs/Manual/English/screenshots/moved-01.png

diff --git a/Docs/Manual/EN/screenshots/nav_uparrow_btn.png b/Docs/Manual/English/screenshots/nav_uparrow_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/nav_uparrow_btn.png
rename to Docs/Manual/English/screenshots/nav_uparrow_btn.png

diff --git a/Docs/Manual/EN/screenshots/nextdiff_btn.png b/Docs/Manual/English/screenshots/nextdiff_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/nextdiff_btn.png
rename to Docs/Manual/English/screenshots/nextdiff_btn.png

diff --git a/Docs/Manual/EN/screenshots/notequal.png b/Docs/Manual/English/screenshots/notequal.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/notequal.png
rename to Docs/Manual/English/screenshots/notequal.png

diff --git a/Docs/Manual/EN/screenshots/notequaltextfile.png b/Docs/Manual/English/screenshots/notequaltextfile.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/notequaltextfile.png
rename to Docs/Manual/English/screenshots/notequaltextfile.png

diff --git a/Docs/Manual/EN/screenshots/open_icon.png b/Docs/Manual/English/screenshots/open_icon.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/open_icon.png
rename to Docs/Manual/English/screenshots/open_icon.png

diff --git a/Docs/Manual/EN/screenshots/options_btn.png b/Docs/Manual/English/screenshots/options_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/options_btn.png
rename to Docs/Manual/English/screenshots/options_btn.png

diff --git a/Docs/Manual/EN/screenshots/prevdiff_btn.png b/Docs/Manual/English/screenshots/prevdiff_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/prevdiff_btn.png
rename to Docs/Manual/English/screenshots/prevdiff_btn.png

diff --git a/Docs/Manual/EN/screenshots/projfile_save.png b/Docs/Manual/English/screenshots/projfile_save.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/projfile_save.png
rename to Docs/Manual/English/screenshots/projfile_save.png

diff --git a/Docs/Manual/EN/screenshots/refresh_btn.png b/Docs/Manual/English/screenshots/refresh_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/refresh_btn.png
rename to Docs/Manual/English/screenshots/refresh_btn.png

diff --git a/Docs/Manual/EN/screenshots/rfile.png b/Docs/Manual/English/screenshots/rfile.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/rfile.png
rename to Docs/Manual/English/screenshots/rfile.png

diff --git a/Docs/Manual/EN/screenshots/rfolder.png b/Docs/Manual/English/screenshots/rfolder.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/rfolder.png
rename to Docs/Manual/English/screenshots/rfolder.png

diff --git a/Docs/Manual/EN/screenshots/simlines-diffs-off.png b/Docs/Manual/English/screenshots/simlines-diffs-off.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/simlines-diffs-off.png
rename to Docs/Manual/English/screenshots/simlines-diffs-off.png

diff --git a/Docs/Manual/EN/screenshots/simlines-diffs-on.png b/Docs/Manual/English/screenshots/simlines-diffs-on.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/simlines-diffs-on.png
rename to Docs/Manual/English/screenshots/simlines-diffs-on.png

diff --git a/Docs/Manual/EN/screenshots/tblcomp1.png b/Docs/Manual/English/screenshots/tblcomp1.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/tblcomp1.png
rename to Docs/Manual/English/screenshots/tblcomp1.png

diff --git a/Docs/Manual/EN/screenshots/tfs_configure.png b/Docs/Manual/English/screenshots/tfs_configure.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/tfs_configure.png
rename to Docs/Manual/English/screenshots/tfs_configure.png

diff --git a/Docs/Manual/EN/screenshots/treeview-01.png b/Docs/Manual/English/screenshots/treeview-01.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/treeview-01.png
rename to Docs/Manual/English/screenshots/treeview-01.png

diff --git a/Docs/Manual/EN/screenshots/undo_btn.png b/Docs/Manual/English/screenshots/undo_btn.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/undo_btn.png
rename to Docs/Manual/English/screenshots/undo_btn.png

diff --git a/Docs/Manual/EN/screenshots/wm_icon.png b/Docs/Manual/English/screenshots/wm_icon.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/wm_icon.png
rename to Docs/Manual/English/screenshots/wm_icon.png

diff --git a/Docs/Manual/EN/screenshots/word-diff-allwhite.png b/Docs/Manual/English/screenshots/word-diff-allwhite.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/word-diff-allwhite.png
rename to Docs/Manual/English/screenshots/word-diff-allwhite.png

diff --git a/Docs/Manual/EN/screenshots/word-diff-nochange.png b/Docs/Manual/English/screenshots/word-diff-nochange.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/word-diff-nochange.png
rename to Docs/Manual/English/screenshots/word-diff-nochange.png

diff --git a/Docs/Manual/EN/screenshots/word-diff-nowhite.png b/Docs/Manual/English/screenshots/word-diff-nowhite.png
similarity index 100%
rename from Docs/Manual/EN/screenshots/word-diff-nowhite.png
rename to Docs/Manual/English/screenshots/word-diff-nowhite.png

diff --git a/Docs/Manual/EN/select_unpacker.xml b/Docs/Manual/English/select_unpacker.xml
similarity index 100%
rename from Docs/Manual/EN/select_unpacker.xml
rename to Docs/Manual/English/select_unpacker.xml

diff --git a/Docs/Manual/EN/xsl/html.xsl b/Docs/Manual/English/xsl/html.xsl
similarity index 100%
rename from Docs/Manual/EN/xsl/html.xsl
rename to Docs/Manual/English/xsl/html.xsl

diff --git a/Docs/Manual/EN/xsl/htmlhelp.xsl b/Docs/Manual/English/xsl/htmlhelp.xsl
similarity index 100%
rename from Docs/Manual/EN/xsl/htmlhelp.xsl
rename to Docs/Manual/English/xsl/htmlhelp.xsl

diff --git a/Docs/Manual/JP/About_Doc.xml b/Docs/Manual/Japanese/About_Doc.xml
similarity index 100%
rename from Docs/Manual/JP/About_Doc.xml
rename to Docs/Manual/Japanese/About_Doc.xml

diff --git a/Docs/Manual/JP/Command_line.xml b/Docs/Manual/Japanese/Command_line.xml
similarity index 100%
rename from Docs/Manual/JP/Command_line.xml
rename to Docs/Manual/Japanese/Command_line.xml

diff --git a/Docs/Manual/JP/Compare_bin.xml b/Docs/Manual/Japanese/Compare_bin.xml
similarity index 100%
rename from Docs/Manual/JP/Compare_bin.xml
rename to Docs/Manual/Japanese/Compare_bin.xml

diff --git a/Docs/Manual/JP/Compare_dirs.xml b/Docs/Manual/Japanese/Compare_dirs.xml
similarity index 100%
rename from Docs/Manual/JP/Compare_dirs.xml
rename to Docs/Manual/Japanese/Compare_dirs.xml

diff --git a/Docs/Manual/JP/Compare_files.xml b/Docs/Manual/Japanese/Compare_files.xml
similarity index 100%
rename from Docs/Manual/JP/Compare_files.xml
rename to Docs/Manual/Japanese/Compare_files.xml

diff --git a/Docs/Manual/JP/Compare_images.xml b/Docs/Manual/Japanese/Compare_images.xml
similarity index 100%
rename from Docs/Manual/JP/Compare_images.xml
rename to Docs/Manual/Japanese/Compare_images.xml

diff --git a/Docs/Manual/JP/Compare_table.xml b/Docs/Manual/Japanese/Compare_table.xml
similarity index 100%
rename from Docs/Manual/JP/Compare_table.xml
rename to Docs/Manual/Japanese/Compare_table.xml

diff --git a/Docs/Manual/JP/Compare_webpages.xml b/Docs/Manual/Japanese/Compare_webpages.xml
similarity index 100%
rename from Docs/Manual/JP/Compare_webpages.xml
rename to Docs/Manual/Japanese/Compare_webpages.xml

diff --git a/Docs/Manual/JP/Configuration.xml b/Docs/Manual/Japanese/Configuration.xml
similarity index 100%
rename from Docs/Manual/JP/Configuration.xml
rename to Docs/Manual/Japanese/Configuration.xml

diff --git a/Docs/Manual/JP/Faq.xml b/Docs/Manual/Japanese/Faq.xml
similarity index 100%
rename from Docs/Manual/JP/Faq.xml
rename to Docs/Manual/Japanese/Faq.xml

diff --git a/Docs/Manual/JP/Filters.xml b/Docs/Manual/Japanese/Filters.xml
similarity index 100%
rename from Docs/Manual/JP/Filters.xml
rename to Docs/Manual/Japanese/Filters.xml

diff --git a/Docs/Manual/JP/Index.xml b/Docs/Manual/Japanese/Index.xml
similarity index 100%
rename from Docs/Manual/JP/Index.xml
rename to Docs/Manual/Japanese/Index.xml

diff --git a/Docs/Manual/JP/Install.xml b/Docs/Manual/Japanese/Install.xml
similarity index 100%
rename from Docs/Manual/JP/Install.xml
rename to Docs/Manual/Japanese/Install.xml

diff --git a/Docs/Manual/JP/Intro_diffs.xml b/Docs/Manual/Japanese/Intro_diffs.xml
similarity index 100%
rename from Docs/Manual/JP/Intro_diffs.xml
rename to Docs/Manual/Japanese/Intro_diffs.xml

diff --git a/Docs/Manual/JP/Introduction.xml b/Docs/Manual/Japanese/Introduction.xml
similarity index 100%
rename from Docs/Manual/JP/Introduction.xml
rename to Docs/Manual/Japanese/Introduction.xml

diff --git a/Docs/Manual/JP/Locales.xml b/Docs/Manual/Japanese/Locales.xml
similarity index 100%
rename from Docs/Manual/JP/Locales.xml
rename to Docs/Manual/Japanese/Locales.xml

diff --git a/Docs/Manual/JP/Open_paths.xml b/Docs/Manual/Japanese/Open_paths.xml
similarity index 100%
rename from Docs/Manual/JP/Open_paths.xml
rename to Docs/Manual/Japanese/Open_paths.xml

diff --git a/Docs/Manual/JP/Plugins.xml b/Docs/Manual/Japanese/Plugins.xml
similarity index 100%
rename from Docs/Manual/JP/Plugins.xml
rename to Docs/Manual/Japanese/Plugins.xml

diff --git a/Docs/Manual/JP/Quick_start.xml b/Docs/Manual/Japanese/Quick_start.xml
similarity index 100%
rename from Docs/Manual/JP/Quick_start.xml
rename to Docs/Manual/Japanese/Quick_start.xml

diff --git a/Docs/Manual/JP/Shortcut_keys.xml b/Docs/Manual/Japanese/Shortcut_keys.xml
similarity index 100%
rename from Docs/Manual/JP/Shortcut_keys.xml
rename to Docs/Manual/Japanese/Shortcut_keys.xml

diff --git a/Docs/Manual/JP/Version_control.xml b/Docs/Manual/Japanese/Version_control.xml
similarity index 100%
rename from Docs/Manual/JP/Version_control.xml
rename to Docs/Manual/Japanese/Version_control.xml

diff --git a/Docs/Manual/JP/_Copyrights.xml b/Docs/Manual/Japanese/_Copyrights.xml
similarity index 100%
rename from Docs/Manual/JP/_Copyrights.xml
rename to Docs/Manual/Japanese/_Copyrights.xml

diff --git a/Docs/Manual/JP/_VersionNumbers.xml b/Docs/Manual/Japanese/_VersionNumbers.xml
similarity index 100%
rename from Docs/Manual/JP/_VersionNumbers.xml
rename to Docs/Manual/Japanese/_VersionNumbers.xml

diff --git a/Docs/Manual/JP/screenshots/OpenDlg1.png b/Docs/Manual/Japanese/screenshots/OpenDlg1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/OpenDlg1.png
rename to Docs/Manual/Japanese/screenshots/OpenDlg1.png

diff --git a/Docs/Manual/JP/screenshots/aborted.png b/Docs/Manual/Japanese/screenshots/aborted.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/aborted.png
rename to Docs/Manual/Japanese/screenshots/aborted.png

diff --git a/Docs/Manual/JP/screenshots/allleft_btn.png b/Docs/Manual/Japanese/screenshots/allleft_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/allleft_btn.png
rename to Docs/Manual/Japanese/screenshots/allleft_btn.png

diff --git a/Docs/Manual/JP/screenshots/allright_btn.png b/Docs/Manual/Japanese/screenshots/allright_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/allright_btn.png
rename to Docs/Manual/Japanese/screenshots/allright_btn.png

diff --git a/Docs/Manual/JP/screenshots/binary.png b/Docs/Manual/Japanese/screenshots/binary.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/binary.png
rename to Docs/Manual/Japanese/screenshots/binary.png

diff --git a/Docs/Manual/JP/screenshots/binarydiff.png b/Docs/Manual/Japanese/screenshots/binarydiff.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/binarydiff.png
rename to Docs/Manual/Japanese/screenshots/binarydiff.png

diff --git a/Docs/Manual/JP/screenshots/char-diff-01.png b/Docs/Manual/Japanese/screenshots/char-diff-01.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/char-diff-01.png
rename to Docs/Manual/Japanese/screenshots/char-diff-01.png

diff --git a/Docs/Manual/JP/screenshots/copyl_adv_btn.png b/Docs/Manual/Japanese/screenshots/copyl_adv_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/copyl_adv_btn.png
rename to Docs/Manual/Japanese/screenshots/copyl_adv_btn.png

diff --git a/Docs/Manual/JP/screenshots/copyl_button.png b/Docs/Manual/Japanese/screenshots/copyl_button.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/copyl_button.png
rename to Docs/Manual/Japanese/screenshots/copyl_button.png

diff --git a/Docs/Manual/JP/screenshots/copyr_adv_btn.png b/Docs/Manual/Japanese/screenshots/copyr_adv_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/copyr_adv_btn.png
rename to Docs/Manual/Japanese/screenshots/copyr_adv_btn.png

diff --git a/Docs/Manual/JP/screenshots/copyr_button.png b/Docs/Manual/Japanese/screenshots/copyr_button.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/copyr_button.png
rename to Docs/Manual/Japanese/screenshots/copyr_button.png

diff --git a/Docs/Manual/JP/screenshots/ctx_menu_advanced.png b/Docs/Manual/Japanese/screenshots/ctx_menu_advanced.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/ctx_menu_advanced.png
rename to Docs/Manual/Japanese/screenshots/ctx_menu_advanced.png

diff --git a/Docs/Manual/JP/screenshots/ctx_menu_copy1.png b/Docs/Manual/Japanese/screenshots/ctx_menu_copy1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/ctx_menu_copy1.png
rename to Docs/Manual/Japanese/screenshots/ctx_menu_copy1.png

diff --git a/Docs/Manual/JP/screenshots/ctx_menu_copy2.png b/Docs/Manual/Japanese/screenshots/ctx_menu_copy2.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/ctx_menu_copy2.png
rename to Docs/Manual/Japanese/screenshots/ctx_menu_copy2.png

diff --git a/Docs/Manual/JP/screenshots/ctx_menu_simple.png b/Docs/Manual/Japanese/screenshots/ctx_menu_simple.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/ctx_menu_simple.png
rename to Docs/Manual/Japanese/screenshots/ctx_menu_simple.png

diff --git a/Docs/Manual/JP/screenshots/currentdiff_btn.png b/Docs/Manual/Japanese/screenshots/currentdiff_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/currentdiff_btn.png
rename to Docs/Manual/Japanese/screenshots/currentdiff_btn.png

diff --git a/Docs/Manual/JP/screenshots/diff-blocks-01.png b/Docs/Manual/Japanese/screenshots/diff-blocks-01.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/diff-blocks-01.png
rename to Docs/Manual/Japanese/screenshots/diff-blocks-01.png

diff --git a/Docs/Manual/JP/screenshots/diff_inline_btn.png b/Docs/Manual/Japanese/screenshots/diff_inline_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/diff_inline_btn.png
rename to Docs/Manual/Japanese/screenshots/diff_inline_btn.png

diff --git a/Docs/Manual/JP/screenshots/equal.png b/Docs/Manual/Japanese/screenshots/equal.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/equal.png
rename to Docs/Manual/Japanese/screenshots/equal.png

diff --git a/Docs/Manual/JP/screenshots/equaltextfile.png b/Docs/Manual/Japanese/screenshots/equaltextfile.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/equaltextfile.png
rename to Docs/Manual/Japanese/screenshots/equaltextfile.png

diff --git a/Docs/Manual/JP/screenshots/error.png b/Docs/Manual/Japanese/screenshots/error.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/error.png
rename to Docs/Manual/Japanese/screenshots/error.png

diff --git a/Docs/Manual/JP/screenshots/file_headerbar1.png b/Docs/Manual/Japanese/screenshots/file_headerbar1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/file_headerbar1.png
rename to Docs/Manual/Japanese/screenshots/file_headerbar1.png

diff --git a/Docs/Manual/JP/screenshots/filecomp1.png b/Docs/Manual/Japanese/screenshots/filecomp1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/filecomp1.png
rename to Docs/Manual/Japanese/screenshots/filecomp1.png

diff --git a/Docs/Manual/JP/screenshots/filecomp_context1.png b/Docs/Manual/Japanese/screenshots/filecomp_context1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/filecomp_context1.png
rename to Docs/Manual/Japanese/screenshots/filecomp_context1.png

diff --git a/Docs/Manual/JP/screenshots/filecomp_diffpane1.png b/Docs/Manual/Japanese/screenshots/filecomp_diffpane1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/filecomp_diffpane1.png
rename to Docs/Manual/Japanese/screenshots/filecomp_diffpane1.png

diff --git a/Docs/Manual/JP/screenshots/filecomp_inlinediff.png b/Docs/Manual/Japanese/screenshots/filecomp_inlinediff.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/filecomp_inlinediff.png
rename to Docs/Manual/Japanese/screenshots/filecomp_inlinediff.png

diff --git a/Docs/Manual/JP/screenshots/filecomp_margin1.png b/Docs/Manual/Japanese/screenshots/filecomp_margin1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/filecomp_margin1.png
rename to Docs/Manual/Japanese/screenshots/filecomp_margin1.png

diff --git a/Docs/Manual/JP/screenshots/filecomp_margin2.png b/Docs/Manual/Japanese/screenshots/filecomp_margin2.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/filecomp_margin2.png
rename to Docs/Manual/Japanese/screenshots/filecomp_margin2.png

diff --git a/Docs/Manual/JP/screenshots/filemerged1.png b/Docs/Manual/Japanese/screenshots/filemerged1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/filemerged1.png
rename to Docs/Manual/Japanese/screenshots/filemerged1.png

diff --git a/Docs/Manual/JP/screenshots/fileskip.png b/Docs/Manual/Japanese/screenshots/fileskip.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/fileskip.png
rename to Docs/Manual/Japanese/screenshots/fileskip.png

diff --git a/Docs/Manual/JP/screenshots/firstdiff_btn.png b/Docs/Manual/Japanese/screenshots/firstdiff_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/firstdiff_btn.png
rename to Docs/Manual/Japanese/screenshots/firstdiff_btn.png

diff --git a/Docs/Manual/JP/screenshots/foldercmp_progress.png b/Docs/Manual/Japanese/screenshots/foldercmp_progress.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/foldercmp_progress.png
rename to Docs/Manual/Japanese/screenshots/foldercmp_progress.png

diff --git a/Docs/Manual/JP/screenshots/foldercmp_unique1.png b/Docs/Manual/Japanese/screenshots/foldercmp_unique1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/foldercmp_unique1.png
rename to Docs/Manual/Japanese/screenshots/foldercmp_unique1.png

diff --git a/Docs/Manual/JP/screenshots/foldercmp_unique2.png b/Docs/Manual/Japanese/screenshots/foldercmp_unique2.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/foldercmp_unique2.png
rename to Docs/Manual/Japanese/screenshots/foldercmp_unique2.png

diff --git a/Docs/Manual/JP/screenshots/foldercomp1.png b/Docs/Manual/Japanese/screenshots/foldercomp1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/foldercomp1.png
rename to Docs/Manual/Japanese/screenshots/foldercomp1.png

diff --git a/Docs/Manual/JP/screenshots/foldercomp_2same.png b/Docs/Manual/Japanese/screenshots/foldercomp_2same.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/foldercomp_2same.png
rename to Docs/Manual/Japanese/screenshots/foldercomp_2same.png

diff --git a/Docs/Manual/JP/screenshots/folderdiff.png b/Docs/Manual/Japanese/screenshots/folderdiff.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/folderdiff.png
rename to Docs/Manual/Japanese/screenshots/folderdiff.png

diff --git a/Docs/Manual/JP/screenshots/foldersame.png b/Docs/Manual/Japanese/screenshots/foldersame.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/foldersame.png
rename to Docs/Manual/Japanese/screenshots/foldersame.png

diff --git a/Docs/Manual/JP/screenshots/folderskip.png b/Docs/Manual/Japanese/screenshots/folderskip.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/folderskip.png
rename to Docs/Manual/Japanese/screenshots/folderskip.png

diff --git a/Docs/Manual/JP/screenshots/folderup.png b/Docs/Manual/Japanese/screenshots/folderup.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/folderup.png
rename to Docs/Manual/Japanese/screenshots/folderup.png

diff --git a/Docs/Manual/JP/screenshots/folderup_disable.png b/Docs/Manual/Japanese/screenshots/folderup_disable.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/folderup_disable.png
rename to Docs/Manual/Japanese/screenshots/folderup_disable.png

diff --git a/Docs/Manual/JP/screenshots/hexcmp1.png b/Docs/Manual/Japanese/screenshots/hexcmp1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/hexcmp1.png
rename to Docs/Manual/Japanese/screenshots/hexcmp1.png

diff --git a/Docs/Manual/JP/screenshots/ignore-blank-lines.png b/Docs/Manual/Japanese/screenshots/ignore-blank-lines.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/ignore-blank-lines.png
rename to Docs/Manual/Japanese/screenshots/ignore-blank-lines.png

diff --git a/Docs/Manual/JP/screenshots/imgcmp1.png b/Docs/Manual/Japanese/screenshots/imgcmp1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/imgcmp1.png
rename to Docs/Manual/Japanese/screenshots/imgcmp1.png

diff --git a/Docs/Manual/JP/screenshots/lastdiff_btn.png b/Docs/Manual/Japanese/screenshots/lastdiff_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/lastdiff_btn.png
rename to Docs/Manual/Japanese/screenshots/lastdiff_btn.png

diff --git a/Docs/Manual/JP/screenshots/lfile.png b/Docs/Manual/Japanese/screenshots/lfile.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/lfile.png
rename to Docs/Manual/Japanese/screenshots/lfile.png

diff --git a/Docs/Manual/JP/screenshots/lfolder.png b/Docs/Manual/Japanese/screenshots/lfolder.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/lfolder.png
rename to Docs/Manual/Japanese/screenshots/lfolder.png

diff --git a/Docs/Manual/JP/screenshots/line-diff-punctuation.png b/Docs/Manual/Japanese/screenshots/line-diff-punctuation.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/line-diff-punctuation.png
rename to Docs/Manual/Japanese/screenshots/line-diff-punctuation.png

diff --git a/Docs/Manual/JP/screenshots/linediff.png b/Docs/Manual/Japanese/screenshots/linediff.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/linediff.png
rename to Docs/Manual/Japanese/screenshots/linediff.png

diff --git a/Docs/Manual/JP/screenshots/locpane_currentdiff.png b/Docs/Manual/Japanese/screenshots/locpane_currentdiff.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/locpane_currentdiff.png
rename to Docs/Manual/Japanese/screenshots/locpane_currentdiff.png

diff --git a/Docs/Manual/JP/screenshots/locpane_diffs.png b/Docs/Manual/Japanese/screenshots/locpane_diffs.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/locpane_diffs.png
rename to Docs/Manual/Japanese/screenshots/locpane_diffs.png

diff --git a/Docs/Manual/JP/screenshots/locpane_moved_diffs.png b/Docs/Manual/Japanese/screenshots/locpane_moved_diffs.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/locpane_moved_diffs.png
rename to Docs/Manual/Japanese/screenshots/locpane_moved_diffs.png

diff --git a/Docs/Manual/JP/screenshots/locpane_viewbar.png b/Docs/Manual/Japanese/screenshots/locpane_viewbar.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/locpane_viewbar.png
rename to Docs/Manual/Japanese/screenshots/locpane_viewbar.png

diff --git a/Docs/Manual/JP/screenshots/merge_menu.png b/Docs/Manual/Japanese/screenshots/merge_menu.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/merge_menu.png
rename to Docs/Manual/Japanese/screenshots/merge_menu.png

diff --git a/Docs/Manual/JP/screenshots/mfile.png b/Docs/Manual/Japanese/screenshots/mfile.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/mfile.png
rename to Docs/Manual/Japanese/screenshots/mfile.png

diff --git a/Docs/Manual/JP/screenshots/mfolder.png b/Docs/Manual/Japanese/screenshots/mfolder.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/mfolder.png
rename to Docs/Manual/Japanese/screenshots/mfolder.png

diff --git a/Docs/Manual/JP/screenshots/missing_lines.png b/Docs/Manual/Japanese/screenshots/missing_lines.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/missing_lines.png
rename to Docs/Manual/Japanese/screenshots/missing_lines.png

diff --git a/Docs/Manual/JP/screenshots/moved-01.png b/Docs/Manual/Japanese/screenshots/moved-01.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/moved-01.png
rename to Docs/Manual/Japanese/screenshots/moved-01.png

diff --git a/Docs/Manual/JP/screenshots/nav_uparrow_btn.png b/Docs/Manual/Japanese/screenshots/nav_uparrow_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/nav_uparrow_btn.png
rename to Docs/Manual/Japanese/screenshots/nav_uparrow_btn.png

diff --git a/Docs/Manual/JP/screenshots/nextdiff_btn.png b/Docs/Manual/Japanese/screenshots/nextdiff_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/nextdiff_btn.png
rename to Docs/Manual/Japanese/screenshots/nextdiff_btn.png

diff --git a/Docs/Manual/JP/screenshots/notequal.png b/Docs/Manual/Japanese/screenshots/notequal.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/notequal.png
rename to Docs/Manual/Japanese/screenshots/notequal.png

diff --git a/Docs/Manual/JP/screenshots/notequaltextfile.png b/Docs/Manual/Japanese/screenshots/notequaltextfile.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/notequaltextfile.png
rename to Docs/Manual/Japanese/screenshots/notequaltextfile.png

diff --git a/Docs/Manual/JP/screenshots/open_icon.png b/Docs/Manual/Japanese/screenshots/open_icon.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/open_icon.png
rename to Docs/Manual/Japanese/screenshots/open_icon.png

diff --git a/Docs/Manual/JP/screenshots/options_btn.png b/Docs/Manual/Japanese/screenshots/options_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/options_btn.png
rename to Docs/Manual/Japanese/screenshots/options_btn.png

diff --git a/Docs/Manual/JP/screenshots/prevdiff_btn.png b/Docs/Manual/Japanese/screenshots/prevdiff_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/prevdiff_btn.png
rename to Docs/Manual/Japanese/screenshots/prevdiff_btn.png

diff --git a/Docs/Manual/JP/screenshots/projfile_save.png b/Docs/Manual/Japanese/screenshots/projfile_save.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/projfile_save.png
rename to Docs/Manual/Japanese/screenshots/projfile_save.png

diff --git a/Docs/Manual/JP/screenshots/refresh_btn.png b/Docs/Manual/Japanese/screenshots/refresh_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/refresh_btn.png
rename to Docs/Manual/Japanese/screenshots/refresh_btn.png

diff --git a/Docs/Manual/JP/screenshots/rfile.png b/Docs/Manual/Japanese/screenshots/rfile.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/rfile.png
rename to Docs/Manual/Japanese/screenshots/rfile.png

diff --git a/Docs/Manual/JP/screenshots/rfolder.png b/Docs/Manual/Japanese/screenshots/rfolder.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/rfolder.png
rename to Docs/Manual/Japanese/screenshots/rfolder.png

diff --git a/Docs/Manual/JP/screenshots/simlines-diffs-off.png b/Docs/Manual/Japanese/screenshots/simlines-diffs-off.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/simlines-diffs-off.png
rename to Docs/Manual/Japanese/screenshots/simlines-diffs-off.png

diff --git a/Docs/Manual/JP/screenshots/simlines-diffs-on.png b/Docs/Manual/Japanese/screenshots/simlines-diffs-on.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/simlines-diffs-on.png
rename to Docs/Manual/Japanese/screenshots/simlines-diffs-on.png

diff --git a/Docs/Manual/JP/screenshots/tblcomp1.png b/Docs/Manual/Japanese/screenshots/tblcomp1.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/tblcomp1.png
rename to Docs/Manual/Japanese/screenshots/tblcomp1.png

diff --git a/Docs/Manual/JP/screenshots/tfs_configure.png b/Docs/Manual/Japanese/screenshots/tfs_configure.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/tfs_configure.png
rename to Docs/Manual/Japanese/screenshots/tfs_configure.png

diff --git a/Docs/Manual/JP/screenshots/treeview-01.png b/Docs/Manual/Japanese/screenshots/treeview-01.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/treeview-01.png
rename to Docs/Manual/Japanese/screenshots/treeview-01.png

diff --git a/Docs/Manual/JP/screenshots/undo_btn.png b/Docs/Manual/Japanese/screenshots/undo_btn.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/undo_btn.png
rename to Docs/Manual/Japanese/screenshots/undo_btn.png

diff --git a/Docs/Manual/JP/screenshots/wm_icon.png b/Docs/Manual/Japanese/screenshots/wm_icon.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/wm_icon.png
rename to Docs/Manual/Japanese/screenshots/wm_icon.png

diff --git a/Docs/Manual/JP/screenshots/word-diff-allwhite.png b/Docs/Manual/Japanese/screenshots/word-diff-allwhite.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/word-diff-allwhite.png
rename to Docs/Manual/Japanese/screenshots/word-diff-allwhite.png

diff --git a/Docs/Manual/JP/screenshots/word-diff-nochange.png b/Docs/Manual/Japanese/screenshots/word-diff-nochange.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/word-diff-nochange.png
rename to Docs/Manual/Japanese/screenshots/word-diff-nochange.png

diff --git a/Docs/Manual/JP/screenshots/word-diff-nowhite.png b/Docs/Manual/Japanese/screenshots/word-diff-nowhite.png
similarity index 100%
rename from Docs/Manual/JP/screenshots/word-diff-nowhite.png
rename to Docs/Manual/Japanese/screenshots/word-diff-nowhite.png

diff --git a/Docs/Manual/JP/select_unpacker.xml b/Docs/Manual/Japanese/select_unpacker.xml
similarity index 100%
rename from Docs/Manual/JP/select_unpacker.xml
rename to Docs/Manual/Japanese/select_unpacker.xml

diff --git a/Docs/Manual/JP/xsl/html.xsl b/Docs/Manual/Japanese/xsl/html.xsl
similarity index 100%
rename from Docs/Manual/JP/xsl/html.xsl
rename to Docs/Manual/Japanese/xsl/html.xsl

diff --git a/Docs/Manual/JP/xsl/htmlhelp.xsl b/Docs/Manual/Japanese/xsl/htmlhelp.xsl
similarity index 100%
rename from Docs/Manual/JP/xsl/htmlhelp.xsl
rename to Docs/Manual/Japanese/xsl/htmlhelp.xsl

diff --git a/Docs/Manual/Manual.vcxproj b/Docs/Manual/Manual.vcxproj
index c970e91..e6432f1 100644 (file)
--- a/Docs/Manual/Manual.vcxproj
+++ b/Docs/Manual/Manual.vcxproj
@@ -39,7 +39,7 @@
     <VCProjectVersion Condition="'$(VisualStudioVersion)' == '17'">17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{e11617ca-2d87-4571-b22a-48c922d9a0f9}</ProjectGuid>
-    <RootNamespace>ManualEN</RootNamespace>
+    <RootNamespace>ManualEnglish</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>Manual</ProjectName>
   </PropertyGroup>
@@ -330,215 +330,215 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Xml Include="EN\About_Doc.xml" />
-    <Xml Include="EN\Command_line.xml" />
-    <Xml Include="EN\Compare_bin.xml" />
-    <Xml Include="EN\Compare_dirs.xml" />
-    <Xml Include="EN\Compare_files.xml" />
-    <Xml Include="EN\Compare_images.xml" />
-    <Xml Include="EN\Compare_table.xml" />
-    <Xml Include="EN\Compare_webpages.xml" />
-    <Xml Include="EN\Configuration.xml" />
-    <Xml Include="EN\Faq.xml" />
-    <Xml Include="EN\Filters.xml" />
-    <Xml Include="EN\Index.xml" />
-    <Xml Include="EN\Install.xml" />
-    <Xml Include="EN\Introduction.xml" />
-    <Xml Include="EN\Intro_diffs.xml" />
-    <Xml Include="EN\Locales.xml" />
-    <Xml Include="EN\Open_paths.xml" />
-    <Xml Include="EN\Plugins.xml" />
-    <Xml Include="EN\Quick_start.xml" />
-    <Xml Include="EN\select_unpacker.xml" />
-    <Xml Include="EN\Shortcut_keys.xml" />
-    <Xml Include="EN\Version_control.xml" />
-    <Xml Include="EN\xsl\html.xsl" />
-    <Xml Include="EN\xsl\htmlhelp.xsl" />
-    <Xml Include="EN\_Copyrights.xml" />
-    <Xml Include="EN\_VersionNumbers.xml" />
-    <Xml Include="JP\About_Doc.xml" />
-    <Xml Include="JP\Command_line.xml" />
-    <Xml Include="JP\Compare_bin.xml" />
-    <Xml Include="JP\Compare_dirs.xml" />
-    <Xml Include="JP\Compare_files.xml" />
-    <Xml Include="JP\Compare_images.xml" />
-    <Xml Include="JP\Compare_table.xml" />
-    <Xml Include="JP\Compare_webpages.xml" />
-    <Xml Include="JP\Configuration.xml" />
-    <Xml Include="JP\Faq.xml" />
-    <Xml Include="JP\Filters.xml" />
-    <Xml Include="JP\Index.xml" />
-    <Xml Include="JP\Install.xml" />
-    <Xml Include="JP\Introduction.xml" />
-    <Xml Include="JP\Intro_diffs.xml" />
-    <Xml Include="JP\Locales.xml" />
-    <Xml Include="JP\Open_paths.xml" />
-    <Xml Include="JP\Plugins.xml" />
-    <Xml Include="JP\Quick_start.xml" />
-    <Xml Include="JP\select_unpacker.xml" />
-    <Xml Include="JP\Shortcut_keys.xml" />
-    <Xml Include="JP\Version_control.xml" />
-    <Xml Include="JP\xsl\html.xsl" />
-    <Xml Include="JP\xsl\htmlhelp.xsl" />
-    <Xml Include="JP\_Copyrights.xml" />
-    <Xml Include="JP\_VersionNumbers.xml" />
+    <Xml Include="English\About_Doc.xml" />
+    <Xml Include="English\Command_line.xml" />
+    <Xml Include="English\Compare_bin.xml" />
+    <Xml Include="English\Compare_dirs.xml" />
+    <Xml Include="English\Compare_files.xml" />
+    <Xml Include="English\Compare_images.xml" />
+    <Xml Include="English\Compare_table.xml" />
+    <Xml Include="English\Compare_webpages.xml" />
+    <Xml Include="English\Configuration.xml" />
+    <Xml Include="English\Faq.xml" />
+    <Xml Include="English\Filters.xml" />
+    <Xml Include="English\Index.xml" />
+    <Xml Include="English\Install.xml" />
+    <Xml Include="English\Introduction.xml" />
+    <Xml Include="English\Intro_diffs.xml" />
+    <Xml Include="English\Locales.xml" />
+    <Xml Include="English\Open_paths.xml" />
+    <Xml Include="English\Plugins.xml" />
+    <Xml Include="English\Quick_start.xml" />
+    <Xml Include="English\select_unpacker.xml" />
+    <Xml Include="English\Shortcut_keys.xml" />
+    <Xml Include="English\Version_control.xml" />
+    <Xml Include="English\xsl\html.xsl" />
+    <Xml Include="English\xsl\htmlhelp.xsl" />
+    <Xml Include="English\_Copyrights.xml" />
+    <Xml Include="English\_VersionNumbers.xml" />
+    <Xml Include="Japanese\About_Doc.xml" />
+    <Xml Include="Japanese\Command_line.xml" />
+    <Xml Include="Japanese\Compare_bin.xml" />
+    <Xml Include="Japanese\Compare_dirs.xml" />
+    <Xml Include="Japanese\Compare_files.xml" />
+    <Xml Include="Japanese\Compare_images.xml" />
+    <Xml Include="Japanese\Compare_table.xml" />
+    <Xml Include="Japanese\Compare_webpages.xml" />
+    <Xml Include="Japanese\Configuration.xml" />
+    <Xml Include="Japanese\Faq.xml" />
+    <Xml Include="Japanese\Filters.xml" />
+    <Xml Include="Japanese\Index.xml" />
+    <Xml Include="Japanese\Install.xml" />
+    <Xml Include="Japanese\Introduction.xml" />
+    <Xml Include="Japanese\Intro_diffs.xml" />
+    <Xml Include="Japanese\Locales.xml" />
+    <Xml Include="Japanese\Open_paths.xml" />
+    <Xml Include="Japanese\Plugins.xml" />
+    <Xml Include="Japanese\Quick_start.xml" />
+    <Xml Include="Japanese\select_unpacker.xml" />
+    <Xml Include="Japanese\Shortcut_keys.xml" />
+    <Xml Include="Japanese\Version_control.xml" />
+    <Xml Include="Japanese\xsl\html.xsl" />
+    <Xml Include="Japanese\xsl\htmlhelp.xsl" />
+    <Xml Include="Japanese\_Copyrights.xml" />
+    <Xml Include="Japanese\_VersionNumbers.xml" />
     <Xml Include="Shared\xsl\common.xsl" />
     <Xml Include="Shared\xsl\html.xsl" />
     <Xml Include="Shared\xsl\htmlhelp.xsl" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="EN\screenshots\aborted.png" />
-    <Image Include="EN\screenshots\allleft_btn.png" />
-    <Image Include="EN\screenshots\allright_btn.png" />
-    <Image Include="EN\screenshots\binary.png" />
-    <Image Include="EN\screenshots\binarydiff.png" />
-    <Image Include="EN\screenshots\char-diff-01.png" />
-    <Image Include="EN\screenshots\copyl_adv_btn.png" />
-    <Image Include="EN\screenshots\copyl_button.png" />
-    <Image Include="EN\screenshots\copyr_adv_btn.png" />
-    <Image Include="EN\screenshots\copyr_button.png" />
-    <Image Include="EN\screenshots\ctx_menu_advanced.png" />
-    <Image Include="EN\screenshots\ctx_menu_copy1.png" />
-    <Image Include="EN\screenshots\ctx_menu_simple.png" />
-    <Image Include="EN\screenshots\currentdiff_btn.png" />
-    <Image Include="EN\screenshots\diff-blocks-01.png" />
-    <Image Include="EN\screenshots\diff_inline_btn.png" />
-    <Image Include="EN\screenshots\equal.png" />
-    <Image Include="EN\screenshots\equaltextfile.png" />
-    <Image Include="EN\screenshots\error.png" />
-    <Image Include="EN\screenshots\filecomp1.png" />
-    <Image Include="EN\screenshots\filecomp_context1.png" />
-    <Image Include="EN\screenshots\filecomp_diffpane1.png" />
-    <Image Include="EN\screenshots\filecomp_inlinediff.png" />
-    <Image Include="EN\screenshots\filecomp_margin1.png" />
-    <Image Include="EN\screenshots\filecomp_margin2.png" />
-    <Image Include="EN\screenshots\filemerged1.png" />
-    <Image Include="EN\screenshots\fileskip.png" />
-    <Image Include="EN\screenshots\file_headerbar1.png" />
-    <Image Include="EN\screenshots\firstdiff_btn.png" />
-    <Image Include="EN\screenshots\foldercmp_progress.png" />
-    <Image Include="EN\screenshots\foldercmp_unique1.png" />
-    <Image Include="EN\screenshots\foldercmp_unique2.png" />
-    <Image Include="EN\screenshots\foldercomp1.png" />
-    <Image Include="EN\screenshots\foldercomp_2same.png" />
-    <Image Include="EN\screenshots\folderdiff.png" />
-    <Image Include="EN\screenshots\foldersame.png" />
-    <Image Include="EN\screenshots\folderskip.png" />
-    <Image Include="EN\screenshots\folderup.png" />
-    <Image Include="EN\screenshots\folderup_disable.png" />
-    <Image Include="EN\screenshots\hexcmp1.png" />
-    <Image Include="EN\screenshots\ignore-blank-lines.png" />
-    <Image Include="EN\screenshots\imgcmp1.png" />
-    <Image Include="EN\screenshots\lastdiff_btn.png" />
-    <Image Include="EN\screenshots\lfile.png" />
-    <Image Include="EN\screenshots\lfolder.png" />
-    <Image Include="EN\screenshots\line-diff-punctuation.png" />
-    <Image Include="EN\screenshots\linediff.png" />
-    <Image Include="EN\screenshots\locpane_currentdiff.png" />
-    <Image Include="EN\screenshots\locpane_diffs.png" />
-    <Image Include="EN\screenshots\locpane_moved_diffs.png" />
-    <Image Include="EN\screenshots\locpane_viewbar.png" />
-    <Image Include="EN\screenshots\merge_menu.png" />
-    <Image Include="EN\screenshots\missing_lines.png" />
-    <Image Include="EN\screenshots\moved-01.png" />
-    <Image Include="EN\screenshots\nav_uparrow_btn.png" />
-    <Image Include="EN\screenshots\nextdiff_btn.png" />
-    <Image Include="EN\screenshots\notequal.png" />
-    <Image Include="EN\screenshots\notequaltextfile.png" />
-    <Image Include="EN\screenshots\OpenDlg1.png" />
-    <Image Include="EN\screenshots\open_icon.png" />
-    <Image Include="EN\screenshots\options_btn.png" />
-    <Image Include="EN\screenshots\prevdiff_btn.png" />
-    <Image Include="EN\screenshots\projfile_save.png" />
-    <Image Include="EN\screenshots\refresh_btn.png" />
-    <Image Include="EN\screenshots\rfile.png" />
-    <Image Include="EN\screenshots\rfolder.png" />
-    <Image Include="EN\screenshots\simlines-diffs-off.png" />
-    <Image Include="EN\screenshots\simlines-diffs-on.png" />
-    <Image Include="EN\screenshots\tblcomp1.png" />
-    <Image Include="EN\screenshots\tfs_configure.png" />
-    <Image Include="EN\screenshots\treeview-01.png" />
-    <Image Include="EN\screenshots\undo_btn.png" />
-    <Image Include="EN\screenshots\wm_icon.png" />
-    <Image Include="EN\screenshots\word-diff-allwhite.png" />
-    <Image Include="EN\screenshots\word-diff-nochange.png" />
-    <Image Include="EN\screenshots\word-diff-nowhite.png" />
-    <Image Include="JP\screenshots\aborted.png" />
-    <Image Include="JP\screenshots\allleft_btn.png" />
-    <Image Include="JP\screenshots\allright_btn.png" />
-    <Image Include="JP\screenshots\binary.png" />
-    <Image Include="JP\screenshots\binarydiff.png" />
-    <Image Include="JP\screenshots\char-diff-01.png" />
-    <Image Include="JP\screenshots\copyl_adv_btn.png" />
-    <Image Include="JP\screenshots\copyl_button.png" />
-    <Image Include="JP\screenshots\copyr_adv_btn.png" />
-    <Image Include="JP\screenshots\copyr_button.png" />
-    <Image Include="JP\screenshots\ctx_menu_advanced.png" />
-    <Image Include="JP\screenshots\ctx_menu_copy1.png" />
-    <Image Include="JP\screenshots\ctx_menu_simple.png" />
-    <Image Include="JP\screenshots\currentdiff_btn.png" />
-    <Image Include="JP\screenshots\diff-blocks-01.png" />
-    <Image Include="JP\screenshots\diff_inline_btn.png" />
-    <Image Include="JP\screenshots\equal.png" />
-    <Image Include="JP\screenshots\equaltextfile.png" />
-    <Image Include="JP\screenshots\error.png" />
-    <Image Include="JP\screenshots\filecomp1.png" />
-    <Image Include="JP\screenshots\filecomp_context1.png" />
-    <Image Include="JP\screenshots\filecomp_diffpane1.png" />
-    <Image Include="JP\screenshots\filecomp_inlinediff.png" />
-    <Image Include="JP\screenshots\filecomp_margin1.png" />
-    <Image Include="JP\screenshots\filecomp_margin2.png" />
-    <Image Include="JP\screenshots\filemerged1.png" />
-    <Image Include="JP\screenshots\fileskip.png" />
-    <Image Include="JP\screenshots\file_headerbar1.png" />
-    <Image Include="JP\screenshots\firstdiff_btn.png" />
-    <Image Include="JP\screenshots\foldercmp_progress.png" />
-    <Image Include="JP\screenshots\foldercmp_unique1.png" />
-    <Image Include="JP\screenshots\foldercmp_unique2.png" />
-    <Image Include="JP\screenshots\foldercomp1.png" />
-    <Image Include="JP\screenshots\foldercomp_2same.png" />
-    <Image Include="JP\screenshots\folderdiff.png" />
-    <Image Include="JP\screenshots\foldersame.png" />
-    <Image Include="JP\screenshots\folderskip.png" />
-    <Image Include="JP\screenshots\folderup.png" />
-    <Image Include="JP\screenshots\folderup_disable.png" />
-    <Image Include="JP\screenshots\hexcmp1.png" />
-    <Image Include="JP\screenshots\ignore-blank-lines.png" />
-    <Image Include="JP\screenshots\imgcmp1.png" />
-    <Image Include="JP\screenshots\lastdiff_btn.png" />
-    <Image Include="JP\screenshots\lfile.png" />
-    <Image Include="JP\screenshots\lfolder.png" />
-    <Image Include="JP\screenshots\line-diff-punctuation.png" />
-    <Image Include="JP\screenshots\linediff.png" />
-    <Image Include="JP\screenshots\locpane_currentdiff.png" />
-    <Image Include="JP\screenshots\locpane_diffs.png" />
-    <Image Include="JP\screenshots\locpane_moved_diffs.png" />
-    <Image Include="JP\screenshots\locpane_viewbar.png" />
-    <Image Include="JP\screenshots\merge_menu.png" />
-    <Image Include="JP\screenshots\missing_lines.png" />
-    <Image Include="JP\screenshots\moved-01.png" />
-    <Image Include="JP\screenshots\nav_uparrow_btn.png" />
-    <Image Include="JP\screenshots\nextdiff_btn.png" />
-    <Image Include="JP\screenshots\notequal.png" />
-    <Image Include="JP\screenshots\notequaltextfile.png" />
-    <Image Include="JP\screenshots\OpenDlg1.png" />
-    <Image Include="JP\screenshots\open_icon.png" />
-    <Image Include="JP\screenshots\options_btn.png" />
-    <Image Include="JP\screenshots\prevdiff_btn.png" />
-    <Image Include="JP\screenshots\projfile_save.png" />
-    <Image Include="JP\screenshots\refresh_btn.png" />
-    <Image Include="JP\screenshots\rfile.png" />
-    <Image Include="JP\screenshots\rfolder.png" />
-    <Image Include="JP\screenshots\simlines-diffs-off.png" />
-    <Image Include="JP\screenshots\simlines-diffs-on.png" />
-    <Image Include="JP\screenshots\tblcomp1.png" />
-    <Image Include="JP\screenshots\tfs_configure.png" />
-    <Image Include="JP\screenshots\treeview-01.png" />
-    <Image Include="JP\screenshots\undo_btn.png" />
-    <Image Include="JP\screenshots\wm_icon.png" />
-    <Image Include="JP\screenshots\word-diff-allwhite.png" />
-    <Image Include="JP\screenshots\word-diff-nochange.png" />
-    <Image Include="JP\screenshots\word-diff-nowhite.png" />
+    <Image Include="English\screenshots\aborted.png" />
+    <Image Include="English\screenshots\allleft_btn.png" />
+    <Image Include="English\screenshots\allright_btn.png" />
+    <Image Include="English\screenshots\binary.png" />
+    <Image Include="English\screenshots\binarydiff.png" />
+    <Image Include="English\screenshots\char-diff-01.png" />
+    <Image Include="English\screenshots\copyl_adv_btn.png" />
+    <Image Include="English\screenshots\copyl_button.png" />
+    <Image Include="English\screenshots\copyr_adv_btn.png" />
+    <Image Include="English\screenshots\copyr_button.png" />
+    <Image Include="English\screenshots\ctx_menu_advanced.png" />
+    <Image Include="English\screenshots\ctx_menu_copy1.png" />
+    <Image Include="English\screenshots\ctx_menu_simple.png" />
+    <Image Include="English\screenshots\currentdiff_btn.png" />
+    <Image Include="English\screenshots\diff-blocks-01.png" />
+    <Image Include="English\screenshots\diff_inline_btn.png" />
+    <Image Include="English\screenshots\equal.png" />
+    <Image Include="English\screenshots\equaltextfile.png" />
+    <Image Include="English\screenshots\error.png" />
+    <Image Include="English\screenshots\filecomp1.png" />
+    <Image Include="English\screenshots\filecomp_context1.png" />
+    <Image Include="English\screenshots\filecomp_diffpane1.png" />
+    <Image Include="English\screenshots\filecomp_inlinediff.png" />
+    <Image Include="English\screenshots\filecomp_margin1.png" />
+    <Image Include="English\screenshots\filecomp_margin2.png" />
+    <Image Include="English\screenshots\filemerged1.png" />
+    <Image Include="English\screenshots\fileskip.png" />
+    <Image Include="English\screenshots\file_headerbar1.png" />
+    <Image Include="English\screenshots\firstdiff_btn.png" />
+    <Image Include="English\screenshots\foldercmp_progress.png" />
+    <Image Include="English\screenshots\foldercmp_unique1.png" />
+    <Image Include="English\screenshots\foldercmp_unique2.png" />
+    <Image Include="English\screenshots\foldercomp1.png" />
+    <Image Include="English\screenshots\foldercomp_2same.png" />
+    <Image Include="English\screenshots\folderdiff.png" />
+    <Image Include="English\screenshots\foldersame.png" />
+    <Image Include="English\screenshots\folderskip.png" />
+    <Image Include="English\screenshots\folderup.png" />
+    <Image Include="English\screenshots\folderup_disable.png" />
+    <Image Include="English\screenshots\hexcmp1.png" />
+    <Image Include="English\screenshots\ignore-blank-lines.png" />
+    <Image Include="English\screenshots\imgcmp1.png" />
+    <Image Include="English\screenshots\lastdiff_btn.png" />
+    <Image Include="English\screenshots\lfile.png" />
+    <Image Include="English\screenshots\lfolder.png" />
+    <Image Include="English\screenshots\line-diff-punctuation.png" />
+    <Image Include="English\screenshots\linediff.png" />
+    <Image Include="English\screenshots\locpane_currentdiff.png" />
+    <Image Include="English\screenshots\locpane_diffs.png" />
+    <Image Include="English\screenshots\locpane_moved_diffs.png" />
+    <Image Include="English\screenshots\locpane_viewbar.png" />
+    <Image Include="English\screenshots\merge_menu.png" />
+    <Image Include="English\screenshots\missing_lines.png" />
+    <Image Include="English\screenshots\moved-01.png" />
+    <Image Include="English\screenshots\nav_uparrow_btn.png" />
+    <Image Include="English\screenshots\nextdiff_btn.png" />
+    <Image Include="English\screenshots\notequal.png" />
+    <Image Include="English\screenshots\notequaltextfile.png" />
+    <Image Include="English\screenshots\OpenDlg1.png" />
+    <Image Include="English\screenshots\open_icon.png" />
+    <Image Include="English\screenshots\options_btn.png" />
+    <Image Include="English\screenshots\prevdiff_btn.png" />
+    <Image Include="English\screenshots\projfile_save.png" />
+    <Image Include="English\screenshots\refresh_btn.png" />
+    <Image Include="English\screenshots\rfile.png" />
+    <Image Include="English\screenshots\rfolder.png" />
+    <Image Include="English\screenshots\simlines-diffs-off.png" />
+    <Image Include="English\screenshots\simlines-diffs-on.png" />
+    <Image Include="English\screenshots\tblcomp1.png" />
+    <Image Include="English\screenshots\tfs_configure.png" />
+    <Image Include="English\screenshots\treeview-01.png" />
+    <Image Include="English\screenshots\undo_btn.png" />
+    <Image Include="English\screenshots\wm_icon.png" />
+    <Image Include="English\screenshots\word-diff-allwhite.png" />
+    <Image Include="English\screenshots\word-diff-nochange.png" />
+    <Image Include="English\screenshots\word-diff-nowhite.png" />
+    <Image Include="Japanese\screenshots\aborted.png" />
+    <Image Include="Japanese\screenshots\allleft_btn.png" />
+    <Image Include="Japanese\screenshots\allright_btn.png" />
+    <Image Include="Japanese\screenshots\binary.png" />
+    <Image Include="Japanese\screenshots\binarydiff.png" />
+    <Image Include="Japanese\screenshots\char-diff-01.png" />
+    <Image Include="Japanese\screenshots\copyl_adv_btn.png" />
+    <Image Include="Japanese\screenshots\copyl_button.png" />
+    <Image Include="Japanese\screenshots\copyr_adv_btn.png" />
+    <Image Include="Japanese\screenshots\copyr_button.png" />
+    <Image Include="Japanese\screenshots\ctx_menu_advanced.png" />
+    <Image Include="Japanese\screenshots\ctx_menu_copy1.png" />
+    <Image Include="Japanese\screenshots\ctx_menu_simple.png" />
+    <Image Include="Japanese\screenshots\currentdiff_btn.png" />
+    <Image Include="Japanese\screenshots\diff-blocks-01.png" />
+    <Image Include="Japanese\screenshots\diff_inline_btn.png" />
+    <Image Include="Japanese\screenshots\equal.png" />
+    <Image Include="Japanese\screenshots\equaltextfile.png" />
+    <Image Include="Japanese\screenshots\error.png" />
+    <Image Include="Japanese\screenshots\filecomp1.png" />
+    <Image Include="Japanese\screenshots\filecomp_context1.png" />
+    <Image Include="Japanese\screenshots\filecomp_diffpane1.png" />
+    <Image Include="Japanese\screenshots\filecomp_inlinediff.png" />
+    <Image Include="Japanese\screenshots\filecomp_margin1.png" />
+    <Image Include="Japanese\screenshots\filecomp_margin2.png" />
+    <Image Include="Japanese\screenshots\filemerged1.png" />
+    <Image Include="Japanese\screenshots\fileskip.png" />
+    <Image Include="Japanese\screenshots\file_headerbar1.png" />
+    <Image Include="Japanese\screenshots\firstdiff_btn.png" />
+    <Image Include="Japanese\screenshots\foldercmp_progress.png" />
+    <Image Include="Japanese\screenshots\foldercmp_unique1.png" />
+    <Image Include="Japanese\screenshots\foldercmp_unique2.png" />
+    <Image Include="Japanese\screenshots\foldercomp1.png" />
+    <Image Include="Japanese\screenshots\foldercomp_2same.png" />
+    <Image Include="Japanese\screenshots\folderdiff.png" />
+    <Image Include="Japanese\screenshots\foldersame.png" />
+    <Image Include="Japanese\screenshots\folderskip.png" />
+    <Image Include="Japanese\screenshots\folderup.png" />
+    <Image Include="Japanese\screenshots\folderup_disable.png" />
+    <Image Include="Japanese\screenshots\hexcmp1.png" />
+    <Image Include="Japanese\screenshots\ignore-blank-lines.png" />
+    <Image Include="Japanese\screenshots\imgcmp1.png" />
+    <Image Include="Japanese\screenshots\lastdiff_btn.png" />
+    <Image Include="Japanese\screenshots\lfile.png" />
+    <Image Include="Japanese\screenshots\lfolder.png" />
+    <Image Include="Japanese\screenshots\line-diff-punctuation.png" />
+    <Image Include="Japanese\screenshots\linediff.png" />
+    <Image Include="Japanese\screenshots\locpane_currentdiff.png" />
+    <Image Include="Japanese\screenshots\locpane_diffs.png" />
+    <Image Include="Japanese\screenshots\locpane_moved_diffs.png" />
+    <Image Include="Japanese\screenshots\locpane_viewbar.png" />
+    <Image Include="Japanese\screenshots\merge_menu.png" />
+    <Image Include="Japanese\screenshots\missing_lines.png" />
+    <Image Include="Japanese\screenshots\moved-01.png" />
+    <Image Include="Japanese\screenshots\nav_uparrow_btn.png" />
+    <Image Include="Japanese\screenshots\nextdiff_btn.png" />
+    <Image Include="Japanese\screenshots\notequal.png" />
+    <Image Include="Japanese\screenshots\notequaltextfile.png" />
+    <Image Include="Japanese\screenshots\OpenDlg1.png" />
+    <Image Include="Japanese\screenshots\open_icon.png" />
+    <Image Include="Japanese\screenshots\options_btn.png" />
+    <Image Include="Japanese\screenshots\prevdiff_btn.png" />
+    <Image Include="Japanese\screenshots\projfile_save.png" />
+    <Image Include="Japanese\screenshots\refresh_btn.png" />
+    <Image Include="Japanese\screenshots\rfile.png" />
+    <Image Include="Japanese\screenshots\rfolder.png" />
+    <Image Include="Japanese\screenshots\simlines-diffs-off.png" />
+    <Image Include="Japanese\screenshots\simlines-diffs-on.png" />
+    <Image Include="Japanese\screenshots\tblcomp1.png" />
+    <Image Include="Japanese\screenshots\tfs_configure.png" />
+    <Image Include="Japanese\screenshots\treeview-01.png" />
+    <Image Include="Japanese\screenshots\undo_btn.png" />
+    <Image Include="Japanese\screenshots\wm_icon.png" />
+    <Image Include="Japanese\screenshots\word-diff-allwhite.png" />
+    <Image Include="Japanese\screenshots\word-diff-nochange.png" />
+    <Image Include="Japanese\screenshots\word-diff-nowhite.png" />
     <Image Include="Shared\images\head.gif" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Docs/Manual/Manual.vcxproj.filters b/Docs/Manual/Manual.vcxproj.filters
index e6a90c8..4296ab9 100644 (file)
--- a/Docs/Manual/Manual.vcxproj.filters
+++ b/Docs/Manual/Manual.vcxproj.filters
@@ -1,155 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Xml Include="EN\xsl\htmlhelp.xsl">
-      <Filter>EN\xsl</Filter>
+    <Xml Include="English\xsl\htmlhelp.xsl">
+      <Filter>English\xsl</Filter>
     </Xml>
-    <Xml Include="EN\xsl\html.xsl">
-      <Filter>EN\xsl</Filter>
+    <Xml Include="English\xsl\html.xsl">
+      <Filter>English\xsl</Filter>
     </Xml>
-    <Xml Include="EN\_Copyrights.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\_Copyrights.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\_VersionNumbers.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\_VersionNumbers.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\About_Doc.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\About_Doc.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Command_line.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Command_line.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Compare_bin.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Compare_bin.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Compare_dirs.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Compare_dirs.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Compare_files.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Compare_files.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Compare_images.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Compare_images.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Compare_table.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Compare_table.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Configuration.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Configuration.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Faq.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Faq.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Filters.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Filters.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Index.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Index.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Install.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Install.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Intro_diffs.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Intro_diffs.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Introduction.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Introduction.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Locales.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Locales.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Open_paths.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Open_paths.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Plugins.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Plugins.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Quick_start.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Quick_start.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\select_unpacker.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\select_unpacker.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Shortcut_keys.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Shortcut_keys.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="EN\Version_control.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Version_control.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="JP\xsl\html.xsl">
-      <Filter>JP\xsl</Filter>
+    <Xml Include="Japanese\xsl\html.xsl">
+      <Filter>Japanese\xsl</Filter>
     </Xml>
-    <Xml Include="JP\xsl\htmlhelp.xsl">
-      <Filter>JP\xsl</Filter>
+    <Xml Include="Japanese\xsl\htmlhelp.xsl">
+      <Filter>Japanese\xsl</Filter>
     </Xml>
-    <Xml Include="JP\_Copyrights.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\_Copyrights.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\_VersionNumbers.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\_VersionNumbers.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\About_Doc.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\About_Doc.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Command_line.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Command_line.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Compare_bin.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Compare_bin.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Compare_dirs.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Compare_dirs.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Compare_files.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Compare_files.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Compare_images.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Compare_images.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Compare_table.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Compare_table.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Configuration.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Configuration.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Faq.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Faq.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Filters.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Filters.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Index.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Index.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Install.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Install.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Intro_diffs.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Intro_diffs.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Introduction.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Introduction.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Locales.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Locales.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Open_paths.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Open_paths.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Plugins.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Plugins.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Quick_start.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Quick_start.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\select_unpacker.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\select_unpacker.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Shortcut_keys.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Shortcut_keys.xml">
+      <Filter>Japanese</Filter>
     </Xml>
-    <Xml Include="JP\Version_control.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Version_control.xml">
+      <Filter>Japanese</Filter>
     </Xml>
     <Xml Include="Shared\xsl\common.xsl">
       <Filter>Shared\xsl</Filter>
@@ -160,30 +160,30 @@
     <Xml Include="Shared\xsl\htmlhelp.xsl">
       <Filter>Shared\xsl</Filter>
     </Xml>
-    <Xml Include="EN\Compare_webpages.xml">
-      <Filter>EN</Filter>
+    <Xml Include="English\Compare_webpages.xml">
+      <Filter>English</Filter>
     </Xml>
-    <Xml Include="JP\Compare_webpages.xml">
-      <Filter>JP</Filter>
+    <Xml Include="Japanese\Compare_webpages.xml">
+      <Filter>Japanese</Filter>
     </Xml>
   </ItemGroup>
   <ItemGroup>
-    <Filter Include="EN">
+    <Filter Include="English">
       <UniqueIdentifier>{4c784180-831f-4789-8caa-2ad6080932cc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="EN\screenshots">
+    <Filter Include="English\screenshots">
       <UniqueIdentifier>{d3a562e7-0242-42c8-85ab-b9404d709c40}</UniqueIdentifier>
     </Filter>
-    <Filter Include="EN\xsl">
+    <Filter Include="English\xsl">
       <UniqueIdentifier>{b7a59913-75e6-4e3c-b008-e175fd359ee0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="JP">
+    <Filter Include="Japanese">
       <UniqueIdentifier>{dc82f40f-2ca6-4b2f-89f2-29a9ddee8183}</UniqueIdentifier>
     </Filter>
-    <Filter Include="JP\screenshots">
+    <Filter Include="Japanese\screenshots">
       <UniqueIdentifier>{402b2cf7-3634-4d5b-96cd-f74bb71d655a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="JP\xsl">
+    <Filter Include="Japanese\xsl">
       <UniqueIdentifier>{dbfa7ab6-06cd-4d03-90d9-da62dc2fd019}</UniqueIdentifier>
     </Filter>
     <Filter Include="Shared">
@@ -200,461 +200,461 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="EN\screenshots\aborted.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\aborted.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\allleft_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\allleft_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\allright_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\allright_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\binary.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\binary.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\binarydiff.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\binarydiff.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\char-diff-01.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\char-diff-01.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\copyl_adv_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\copyl_adv_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\copyl_button.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\copyl_button.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\copyr_adv_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\copyr_adv_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\copyr_button.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\copyr_button.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\ctx_menu_advanced.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\ctx_menu_advanced.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\ctx_menu_copy1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\ctx_menu_copy1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\ctx_menu_simple.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\ctx_menu_simple.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\currentdiff_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\currentdiff_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\diff-blocks-01.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\diff-blocks-01.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\diff_inline_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\diff_inline_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\equal.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\equal.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\equaltextfile.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\equaltextfile.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\error.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\error.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\file_headerbar1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\file_headerbar1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\filecomp1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\filecomp1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\filecomp_context1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\filecomp_context1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\filecomp_diffpane1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\filecomp_diffpane1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\filecomp_inlinediff.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\filecomp_inlinediff.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\filecomp_margin1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\filecomp_margin1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\filecomp_margin2.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\filecomp_margin2.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\filemerged1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\filemerged1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\fileskip.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\fileskip.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\firstdiff_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\firstdiff_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\foldercmp_progress.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\foldercmp_progress.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\foldercmp_unique1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\foldercmp_unique1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\foldercmp_unique2.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\foldercmp_unique2.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\foldercomp1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\foldercomp1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\foldercomp_2same.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\foldercomp_2same.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\folderdiff.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\folderdiff.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\foldersame.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\foldersame.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\folderskip.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\folderskip.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\folderup.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\folderup.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\folderup_disable.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\folderup_disable.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\hexcmp1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\hexcmp1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\ignore-blank-lines.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\ignore-blank-lines.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\imgcmp1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\imgcmp1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\lastdiff_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\lastdiff_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\lfile.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\lfile.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\lfolder.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\lfolder.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\line-diff-punctuation.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\line-diff-punctuation.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\linediff.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\linediff.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\locpane_currentdiff.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\locpane_currentdiff.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\locpane_diffs.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\locpane_diffs.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\locpane_moved_diffs.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\locpane_moved_diffs.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\locpane_viewbar.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\locpane_viewbar.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\merge_menu.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\merge_menu.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\missing_lines.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\missing_lines.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\moved-01.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\moved-01.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\nav_uparrow_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\nav_uparrow_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\nextdiff_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\nextdiff_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\notequal.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\notequal.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\notequaltextfile.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\notequaltextfile.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\open_icon.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\open_icon.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\OpenDlg1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\OpenDlg1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\options_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\options_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\prevdiff_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\prevdiff_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\projfile_save.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\projfile_save.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\refresh_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\refresh_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\rfile.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\rfile.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\rfolder.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\rfolder.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\simlines-diffs-off.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\simlines-diffs-off.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\simlines-diffs-on.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\simlines-diffs-on.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\tblcomp1.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\tblcomp1.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\tfs_configure.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\tfs_configure.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\treeview-01.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\treeview-01.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\undo_btn.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\undo_btn.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\wm_icon.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\wm_icon.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\word-diff-allwhite.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\word-diff-allwhite.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\word-diff-nochange.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\word-diff-nochange.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="EN\screenshots\word-diff-nowhite.png">
-      <Filter>EN\screenshots</Filter>
+    <Image Include="English\screenshots\word-diff-nowhite.png">
+      <Filter>English\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\aborted.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\aborted.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\allleft_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\allleft_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\allright_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\allright_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\binary.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\binary.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\binarydiff.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\binarydiff.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\char-diff-01.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\char-diff-01.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\copyl_adv_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\copyl_adv_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\copyl_button.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\copyl_button.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\copyr_adv_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\copyr_adv_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\copyr_button.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\copyr_button.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\ctx_menu_advanced.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\ctx_menu_advanced.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\ctx_menu_copy1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\ctx_menu_copy1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\ctx_menu_simple.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\ctx_menu_simple.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\currentdiff_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\currentdiff_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\diff-blocks-01.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\diff-blocks-01.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\diff_inline_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\diff_inline_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\equal.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\equal.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\equaltextfile.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\equaltextfile.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\error.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\error.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\filecomp1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\filecomp1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\filecomp_context1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\filecomp_context1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\filecomp_diffpane1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\filecomp_diffpane1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\filecomp_inlinediff.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\filecomp_inlinediff.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\filecomp_margin1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\filecomp_margin1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\filecomp_margin2.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\filecomp_margin2.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\filemerged1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\filemerged1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\fileskip.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\fileskip.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\file_headerbar1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\file_headerbar1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\firstdiff_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\firstdiff_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\foldercmp_progress.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\foldercmp_progress.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\foldercmp_unique1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\foldercmp_unique1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\foldercmp_unique2.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\foldercmp_unique2.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\foldercomp1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\foldercomp1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\foldercomp_2same.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\foldercomp_2same.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\folderdiff.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\folderdiff.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\foldersame.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\foldersame.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\folderskip.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\folderskip.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\folderup.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\folderup.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\folderup_disable.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\folderup_disable.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\hexcmp1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\hexcmp1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\ignore-blank-lines.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\ignore-blank-lines.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\imgcmp1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\imgcmp1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\lastdiff_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\lastdiff_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\lfile.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\lfile.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\lfolder.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\lfolder.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\line-diff-punctuation.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\line-diff-punctuation.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\linediff.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\linediff.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\locpane_currentdiff.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\locpane_currentdiff.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\locpane_diffs.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\locpane_diffs.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\locpane_moved_diffs.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\locpane_moved_diffs.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\locpane_viewbar.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\locpane_viewbar.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\merge_menu.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\merge_menu.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\missing_lines.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\missing_lines.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\moved-01.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\moved-01.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\nav_uparrow_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\nav_uparrow_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\nextdiff_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\nextdiff_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\notequal.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\notequal.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\notequaltextfile.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\notequaltextfile.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\OpenDlg1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\OpenDlg1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\open_icon.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\open_icon.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\options_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\options_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\prevdiff_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\prevdiff_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\projfile_save.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\projfile_save.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\refresh_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\refresh_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\rfile.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\rfile.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\rfolder.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\rfolder.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\simlines-diffs-off.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\simlines-diffs-off.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\simlines-diffs-on.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\simlines-diffs-on.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\tblcomp1.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\tblcomp1.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\tfs_configure.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\tfs_configure.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\treeview-01.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\treeview-01.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\undo_btn.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\undo_btn.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\wm_icon.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\wm_icon.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\word-diff-allwhite.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\word-diff-allwhite.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\word-diff-nochange.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\word-diff-nochange.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
-    <Image Include="JP\screenshots\word-diff-nowhite.png">
-      <Filter>JP\screenshots</Filter>
+    <Image Include="Japanese\screenshots\word-diff-nowhite.png">
+      <Filter>Japanese\screenshots</Filter>
     </Image>
     <Image Include="Shared\images\head.gif">
       <Filter>Shared\images</Filter>

diff --git a/Docs/Manual/README.md b/Docs/Manual/README.md
index be4d5bc..bf603fe 100644 (file)
--- a/Docs/Manual/README.md
+++ b/Docs/Manual/README.md
@@ -4,8 +4,8 @@ Our Manuals are written in DocBook and we generate HTML and CHM manuals for dist
 
 We have currently manuals in the following languages:
 
- * [English](EN)
- * [Japanese](JP)
+ * [English](English)
+ * [Japanese](Japanese)
 
 ## Useful DocBook resources
 

diff --git a/Docs/Manual/build_html_en.bat b/Docs/Manual/build_html_en.bat
index ba5bf92..b4ac3c5 100644 (file)
--- a/Docs/Manual/build_html_en.bat
+++ b/Docs/Manual/build_html_en.bat
@@ -3,8 +3,8 @@
 pushd %~dp0
 call configuration.bat
 
-set docbook_inputfile=EN\Index.xml
-set docbook_use_stylesheet=EN\xsl\html.xsl
+set docbook_inputfile=English\Index.xml
+set docbook_use_stylesheet=English\xsl\html.xsl
 set docbook_outputdir=%docbook_build_path%\html-en
 set ads=false
 if "%1" == "withads" goto withads
@@ -32,7 +32,7 @@ copy "Shared\images\*.png" "%docbook_outputdir%\images\."
 
 echo Copy screenshots...
 if not exist "%docbook_outputdir%\screenshots" mkdir "%docbook_outputdir%\screenshots"
-copy "EN\screenshots\*.*" "%docbook_outputdir%\screenshots\."
+copy "English\screenshots\*.*" "%docbook_outputdir%\screenshots\."
 
 echo Copy stylesheets...
 if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"

diff --git a/Docs/Manual/build_html_jp.bat b/Docs/Manual/build_html_jp.bat
index b4fa72c..4a7e360 100644 (file)
--- a/Docs/Manual/build_html_jp.bat
+++ b/Docs/Manual/build_html_jp.bat
@@ -3,8 +3,8 @@
 pushd %~dp0
 call configuration.bat
 
-set docbook_inputfile=JP\Index.xml
-set docbook_use_stylesheet=JP\xsl\html.xsl
+set docbook_inputfile=Japanese\Index.xml
+set docbook_use_stylesheet=Japanese\xsl\html.xsl
 set docbook_outputdir=%docbook_build_path%\html-jp
 set ads=false
 if "%1" == "withads" goto withads
@@ -32,7 +32,7 @@ copy "Shared\images\*.png" "%docbook_outputdir%\images\."
 
 echo Copy screenshots...
 if not exist "%docbook_outputdir%\screenshots" mkdir "%docbook_outputdir%\screenshots"
-copy "JP\screenshots\*.*" "%docbook_outputdir%\screenshots\."
+copy "Japanese\screenshots\*.*" "%docbook_outputdir%\screenshots\."
 
 echo Copy stylesheets...
 if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"

diff --git a/Docs/Manual/build_htmlhelp_en.bat b/Docs/Manual/build_htmlhelp_en.bat
index 1a8ce53..4431f1e 100644 (file)
--- a/Docs/Manual/build_htmlhelp_en.bat
+++ b/Docs/Manual/build_htmlhelp_en.bat
@@ -4,8 +4,8 @@ setlocal enabledelayedexpansion
 pushd %~dp0
 call configuration.bat
 
-set docbook_inputfile=EN\Index.xml
-set docbook_use_stylesheet=EN\xsl\htmlhelp.xsl
+set docbook_inputfile=English\Index.xml
+set docbook_use_stylesheet=English\xsl\htmlhelp.xsl
 set docbook_outputdir=htmlhelp
 set docbook_outputdir_final=%docbook_build_path%\%docbook_outputdir%
 
@@ -14,10 +14,10 @@ if not exist "%docbook_outputdir_final%" mkdir "%docbook_outputdir_final%"
 
 if "%1" == "/build" (
   if exist "%docbook_outputdir_final%\WinMerge.chm" (
-    copy "%docbook_outputdir_final%\WinMerge.chm" EN\WinMerge.chm 2> NUL > NUL
+    copy "%docbook_outputdir_final%\WinMerge.chm" English\WinMerge.chm 2> NUL > NUL
   )
-  for /f "tokens=*" %%i in ('dir /a:-d /b /o:d /t:w EN') do set NEWEST=%%~nxi
-  del EN\WinMerge.chm 2> NUL
+  for /f "tokens=*" %%i in ('dir /a:-d /b /o:d /t:w English') do set NEWEST=%%~nxi
+  del English\WinMerge.chm 2> NUL
   if "!NEWEST!" == "WinMerge.chm" goto end
 ) else if "%1" == "/clean" (
   del "%docbook_outputdir_final%\WinMerge.chm"
@@ -31,7 +31,7 @@ copy "Shared\images\*.png" "%docbook_outputdir%\images\."
 
 echo Copy screenshots...
 if not exist "%docbook_outputdir%\screenshots" mkdir "%docbook_outputdir%\screenshots"
-copy "EN\screenshots\*.*" "%docbook_outputdir%\screenshots\."
+copy "English\screenshots\*.*" "%docbook_outputdir%\screenshots\."
 
 echo Copy stylesheets...
 if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"

diff --git a/Docs/Manual/build_htmlhelp_jp.bat b/Docs/Manual/build_htmlhelp_jp.bat
index 829b95b..ec9d913 100644 (file)
--- a/Docs/Manual/build_htmlhelp_jp.bat
+++ b/Docs/Manual/build_htmlhelp_jp.bat
@@ -4,8 +4,8 @@ setlocal enabledelayedexpansion
 pushd %~dp0
 call configuration.bat
 
-set docbook_inputfile=JP\Index.xml
-set docbook_use_stylesheet=JP\xsl\htmlhelp.xsl
+set docbook_inputfile=Japanese\Index.xml
+set docbook_use_stylesheet=Japanese\xsl\htmlhelp.xsl
 set docbook_outputdir=htmlhelp
 set docbook_outputdir_final=%docbook_build_path%\%docbook_outputdir%
 
@@ -14,10 +14,10 @@ if not exist "%docbook_outputdir_final%" mkdir "%docbook_outputdir_final%"
 
 if "%1" == "/build" (
   if exist "%docbook_outputdir_final%\WinMergeJapanese.chm" (
-    copy "%docbook_outputdir_final%\WinMergeJapanese.chm" JP\WinMergeJapanese.chm  2> NUL > NUL
+    copy "%docbook_outputdir_final%\WinMergeJapanese.chm" Japanese\WinMergeJapanese.chm 2> NUL > NUL
   )
-  for /f "tokens=*" %%i in ('dir /a:-d /b /o:d /t:w JP') do set NEWEST=%%~nxi
-  del JP\WinMergeJapanese.chm 2> NUL
+  for /f "tokens=*" %%i in ('dir /a:-d /b /o:d /t:w Japanese') do set NEWEST=%%~nxi
+  del Japanese\WinMergeJapanese.chm 2> NUL
   if "!NEWEST!" == "WinMergeJapanese.chm" goto end
 ) else if "%1" == "/clean" (
   del "%docbook_outputdir_final%\WinMergeJapanese.chm"
@@ -31,7 +31,7 @@ copy "Shared\images\*.png" "%docbook_outputdir%\images\."
 
 echo Copy screenshots...
 if not exist "%docbook_outputdir%\screenshots" mkdir "%docbook_outputdir%\screenshots"
-copy "JP\screenshots\*.*" "%docbook_outputdir%\screenshots\."
+copy "Japanese\screenshots\*.*" "%docbook_outputdir%\screenshots\."
 
 echo Copy stylesheets...
 if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"

diff --git a/Testing/GoogleTest/Encoding/codepage_detect_test.cpp b/Testing/GoogleTest/Encoding/codepage_detect_test.cpp
index a1877c0..21c6fdc 100644 (file)
--- a/Testing/GoogleTest/Encoding/codepage_detect_test.cpp
+++ b/Testing/GoogleTest/Encoding/codepage_detect_test.cpp
@@ -76,7 +76,7 @@ namespace
                EXPECT_EQ(false, enc.m_bom);
                EXPECT_EQ(ucr::UTF8, enc.m_unicoding);
 
-               enc = codepage_detect::Guess(_T("../../../Docs/Manual/EN/About_Doc.xml"), 1);
+               enc = codepage_detect::Guess(_T("../../../Docs/Manual/English/About_Doc.xml"), 1);
                EXPECT_EQ(65001, enc.m_codepage);
                EXPECT_EQ(false, enc.m_bom);
                EXPECT_EQ(ucr::UTF8, enc.m_unicoding);