Merge remote-tracking branch 'upstream/master'

.github/workflows/pr_author_auto_assign.yml

@@ -16,6 +16,6 @@ jobs:
       run:
         shell: bash
     steps:
-    - uses: toshimaru/auto-author-assign@v2.1.0
+    - uses: toshimaru/auto-author-assign@v2.1.1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonarcloud.yml

@@ -37,7 +37,7 @@ jobs:
         bash script/android/install_packages.sh
         sudo apt-get -y update
         sudo apt-get -y install libsdl2-dev libsdl2-mixer-dev libsdl2-image-dev
-    - uses: SonarSource/sonarcloud-github-c-cpp@v2
+    - uses: SonarSource/sonarcloud-github-c-cpp@v3
     - name: Prepare SonarCloud cfamily cache
       uses: actions/cache@v4
       with:

VisualStudio/fheroes2/sources.props

@@ -112,6 +112,8 @@
     <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_daily_event_spec_window.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_daily_events_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_rumor_window.cpp" />
@@ -328,6 +330,8 @@
     <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_daily_event_spec_window.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_daily_events_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" />

docs/json/lang_bg.json

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

docs/json/lang_dk.json

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

docs/json/lang_fr.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"French","message":"94%","color":"yellow"}
+{"schemaVersion":1,"label":"French","message":"93%","color":"yellow"}

docs/json/lang_hu.json

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

docs/json/lang_it.json

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

docs/json/lang_nb.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Norwegian","message":"81%","color":"yellow"}
+{"schemaVersion":1,"label":"Norwegian","message":"80%","color":"yellow"}

docs/json/lang_pl.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Polish","message":"82%","color":"yellow"}
+{"schemaVersion":1,"label":"Polish","message":"81%","color":"yellow"}

docs/json/lang_pt.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Brazilian Portuguese","message":"99%","color":"green"}
+{"schemaVersion":1,"label":"Brazilian Portuguese","message":"100%","color":"green"}

docs/json/lang_ru.json

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

docs/json/lang_sk.json

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

docs/json/lang_sv.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Swedish","message":"99%","color":"green"}
+{"schemaVersion":1,"label":"Swedish","message":"100%","color":"green"}

docs/json/lang_uk.json

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

files/lang/be.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fheroes2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-23 11:28+0000\n"
+"POT-Creation-Date: 2024-07-03 03:05+0000\n"
 "PO-Revision-Date: 2022-09-23 16:01+0200\n"
 "Last-Translator: fheroes2 team <fhomm2@gmail.com>\n"
 "Language-Team: \n"
@@ -280,6 +280,9 @@ msgstr ""
 msgid "RUMORS"
 msgstr ""
 
+msgid "EVENTS"
+msgstr ""
+
 msgid "Warrior"
 msgstr "Ваяр"
 
@@ -1850,6 +1853,12 @@ msgstr ""
 msgid "Descendants"
 msgstr ""
 
+msgid "Cannot build. You have already built here today."
+msgstr "Вы ўжо будавалі сёння ў гэтым замку."
+
+msgid "For this action it is necessary to build a castle first."
+msgstr ""
+
 msgid "The %{building} produces %{monster}."
 msgstr "%{building} - пабудова, дзе штотыдзень падрыхтоўваюцца %{monster}."
 
@@ -1859,12 +1868,6 @@ msgstr "Неабходна:"
 msgid "Exit this menu without doing anything."
 msgstr "Выйсці з меню, нічога не змяняючы."
 
-msgid "Cannot build. You have already built here today."
-msgstr "Вы ўжо будавалі сёння ў гэтым замку."
-
-msgid "For this action it is necessary to build a castle first."
-msgstr ""
-
 #, fuzzy
 msgid "Cannot build %{name}. The castle is too far away from an ocean."
 msgstr "Нельга пабудаваць %{name}, бо замак занадта далёка ад вады."
@@ -3728,7 +3731,7 @@ msgstr ""
 msgid "Message Text:"
 msgstr ""
 
-msgid "Cancel event after first visit"
+msgid "Reward:"
 msgstr ""
 
 msgid "Player colors allowed to get event:"
@@ -3737,7 +3740,10 @@ msgstr ""
 msgid "Computer colors allowed to get event:"
 msgstr ""
 
-msgid "Reward:"
+msgid "First day of occurrence:"
+msgstr ""
+
+msgid "Repeat period (days):"
 msgstr ""
 
 msgid "Allow %{color} human player to get event"
@@ -3763,25 +3769,63 @@ msgstr ""
 msgid "Click to save the Event properties."
 msgstr "Назва абранай мапы."
 
-msgid "Artifact"
+msgid "No resources will be given as a reward."
 msgstr ""
 
-msgid "No artifact will be given as a reward."
+msgid "Resources"
 msgstr ""
 
-msgid "Delete Artifact"
+msgid "Resources will be given as a reward."
 msgstr ""
 
-msgid "Delete an artifact from the reward."
+#, fuzzy
+msgid "Click here to change the event message."
+msgstr "Назва абранай мапы."
+
+msgid "Event Message Text"
 msgstr ""
 
-msgid "No resources will be given as a reward."
+msgid "Day: %{day}"
+msgstr "Дзень: %{day}"
+
+msgid "Daily Events"
 msgstr ""
 
-msgid "Resources"
+#, fuzzy
+msgid "Click to save the events."
+msgstr "Назва абранай мапы."
+
+msgid "Add Event"
 msgstr ""
 
-msgid "Resources will be given as a reward."
+msgid "Add an additional event."
+msgstr ""
+
+msgid "Edit Event"
+msgstr ""
+
+msgid "Edit an existing event."
+msgstr ""
+
+msgid "Delete Event"
+msgstr ""
+
+msgid "Delete an existing event."
+msgstr ""
+
+msgid "Cancel event after first visit"
+msgstr ""
+
+msgid "Artifact"
+msgstr ""
+
+msgid "No artifact will be given as a reward."
+msgstr ""
+
+msgid "Delete Artifact"
+msgstr ""
+
+msgid "Delete an artifact from the reward."
 msgstr ""
 
 msgid ""
@@ -3790,13 +3834,6 @@ msgid ""
 "crosses the event tile."
 msgstr ""
 
-#, fuzzy
-msgid "Click here to change the event message."
-msgstr "Назва абранай мапы."
-
-msgid "Event Message Text"
-msgstr ""
-
 msgid "%{objects} cannot be placed on water."
 msgstr ""
 
@@ -3885,6 +3922,9 @@ msgstr ""
 msgid "Only one Random Ultimate Artifact can be placed on the map."
 msgstr ""
 
+msgid "A maximum of %{count} obelisks can be placed on the map."
+msgstr ""
+
 msgid "The map is corrupted."
 msgstr ""
 
@@ -4194,20 +4234,30 @@ msgid "Run out of time."
 msgstr ""
 
 #, fuzzy
-msgid "Map Difficulty"
-msgstr "Складанасць мапы:"
+msgid "Special Loss Condition"
+msgstr "Умова паразы"
 
 #, fuzzy
-msgid "Map Description"
-msgstr "Апісанне"
+msgid "Special Victory Condition"
+msgstr "Умова перамогі"
 
 #, fuzzy
-msgid "Special Victory Condition"
+msgid "Allow standard victory conditions"
 msgstr "Умова перамогі"
 
+msgid "Gold:"
+msgstr ""
+
+msgid "Days:"
+msgstr ""
+
 #, fuzzy
-msgid "Special Loss Condition"
-msgstr "Умова паразы"
+msgid "Map Difficulty"
+msgstr "Складанасць мапы:"
+
+#, fuzzy
+msgid "Map Description"
+msgstr "Апісанне"
 
 msgid "Change Map Name"
 msgstr ""
@@ -4232,6 +4282,13 @@ msgstr "Назва абранай мапы."
 msgid "Rumors"
 msgstr ""
 
+#, fuzzy
+msgid "Click to edit daily events."
+msgstr "Пстрыкні, каб ухваліць абранае раздзяленне."
+
+msgid "Events"
+msgstr ""
+
 #, fuzzy
 msgid "Click to change your map name."
 msgstr "Пстрыкніце сюды, каб выбраць сцэнар"
@@ -4244,6 +4301,14 @@ msgstr "Тып мапы"
 msgid "Click to change the description of the current map."
 msgstr "Апісанне абранай мапы."
 
+#, fuzzy
+msgid "Click to change the victory condition of the current map."
+msgstr "Апісанне абранай мапы."
+
+#, fuzzy
+msgid "Click to change the loss condition of the current map."
+msgstr "Апісанне абранай мапы."
+
 msgid "Indicates the player types in the scenario. Click to change."
 msgstr ""
 
@@ -4362,6 +4427,9 @@ msgstr ""
 msgid "Delete an existing answer for the question."
 msgstr ""
 
+msgid "Day: %{day} Week: %{week} Month: %{month}"
+msgstr ""
+
 msgid "difficulty|Easy"
 msgstr "Лёгка"
 
@@ -4754,6 +4822,9 @@ msgstr "Наладкі замка"
 msgid "hotkey|open game main menu"
 msgstr "Звычайная гульня"
 
+msgid "hotkey|toggle passability"
+msgstr ""
+
 msgid "hotkey|roland campaign"
 msgstr ""
 
@@ -5646,9 +5717,6 @@ msgstr ""
 msgid "Month: %{month} Week: %{week}"
 msgstr "Месяц: %{month} Тыдзень: %{week}"
 
-msgid "Day: %{day}"
-msgstr "Дзень: %{day}"
-
 msgid ""
 "You find a small\n"
 "quantity of %{resource}."
@@ -9808,13 +9876,13 @@ msgid ""
 "say a word, he hands you a Magic Book."
 msgstr ""
 
-msgid "Dummy 1"
+msgid "Victory can be achieved by finding any Ultimate Artifact."
 msgstr ""
 
-msgid "The reserved artifact."
+msgid "Dummy 2"
 msgstr ""
 
-msgid "Dummy 2"
+msgid "The reserved artifact."
 msgstr ""
 
 msgid "Dummy 3"
@@ -10565,7 +10633,7 @@ msgstr ""
 msgid "No spell to cast."
 msgstr ""
 
-msgid "Your hero has %{point} spell points remaining."
+msgid "Your hero has %{sp} spell points remaining out of %{max}."
 msgstr ""
 
 msgid "View Adventure Spells"