Merge branch 'master' of https://github.com/ihhub/fheroes2.git into random-map-generator

# Conflicts:
#	src/fheroes2/editor/editor_interface.cpp

Author: idshibanov

VisualStudio/fheroes2/sources.props

@@ -109,9 +109,14 @@
     <ClCompile Include="src\fheroes2\editor\editor_interface.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_interface_panel.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_mainmenu.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_map_specs_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_object_popup_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_castle_details_window.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_event_details_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_options.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_save_map_window.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_sphinx_window.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_ui_helper.cpp" />
     <ClCompile Include="src\fheroes2\editor\history_manager.cpp" />
     <ClCompile Include="src\fheroes2\game\difficulty.cpp" />
     <ClCompile Include="src\fheroes2\game\fheroes2.cpp" />
@@ -317,12 +322,17 @@
     <ClInclude Include="src\fheroes2\dialog\dialog_selectitems.h" />
     <ClInclude Include="src\fheroes2\dialog\dialog_selectscenario.h" />
     <ClInclude Include="src\fheroes2\dialog\dialog_system_options.h" />
-    <ClInclude Include="src\fheroes2\editor\editor.h" />
     <ClInclude Include="src\fheroes2\editor\editor_interface.h" />
     <ClInclude Include="src\fheroes2\editor\editor_interface_panel.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_mainmenu.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_map_specs_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_object_popup_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_castle_details_window.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_event_details_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_options.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_save_map_window.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_sphinx_window.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_ui_helper.h" />
     <ClInclude Include="src\fheroes2\editor\history_manager.h" />
     <ClInclude Include="src\fheroes2\game\difficulty.h" />
     <ClInclude Include="src\fheroes2\game\game.h" />

docs/json/lang_be.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Belarusian","message":"19%","color":"red"}
+{"schemaVersion":1,"label":"Belarusian","message":"18%","color":"red"}

docs/json/lang_bg.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Bulgarian","message":"87%","color":"yellow"}
+{"schemaVersion":1,"label":"Bulgarian","message":"85%","color":"yellow"}

docs/json/lang_cs.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Czech","message":"55%","color":"red"}
+{"schemaVersion":1,"label":"Czech","message":"54%","color":"red"}

docs/json/lang_de.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"German","message":"87%","color":"yellow"}
+{"schemaVersion":1,"label":"German","message":"85%","color":"yellow"}

docs/json/lang_dk.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Danish","message":"97%","color":"green"}
+{"schemaVersion":1,"label":"Danish","message":"94%","color":"yellow"}

docs/json/lang_es.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Spanish","message":"68%","color":"red"}
+{"schemaVersion":1,"label":"Spanish","message":"67%","color":"red"}

docs/json/lang_fr.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"French","message":"97%","color":"green"}
+{"schemaVersion":1,"label":"French","message":"95%","color":"green"}

docs/json/lang_hu.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Hungarian","message":"98%","color":"green"}
+{"schemaVersion":1,"label":"Hungarian","message":"96%","color":"green"}

docs/json/lang_it.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Italian","message":"42%","color":"red"}
+{"schemaVersion":1,"label":"Italian","message":"41%","color":"red"}