Merge remote-tracking branch 'upstream/master'

zenseii · Jan 14, 2024 · 272aeb0 · 272aeb0
2 parents 9eb5ba2 + 3a1b175
commit 272aeb0
Show file tree

Hide file tree

Showing 105 changed files with 4,759 additions and 1,251 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/docs/json/lang_bg.json b/docs/json/lang_bg.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Bulgarian","message":"95%","color":"green"}
+{"schemaVersion":1,"label":"Bulgarian","message":"94%","color":"yellow"}
diff --git a/docs/json/lang_dk.json b/docs/json/lang_dk.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Danish","message":"97%","color":"green"}
+{"schemaVersion":1,"label":"Danish","message":"96%","color":"green"}
diff --git a/docs/json/lang_es.json b/docs/json/lang_es.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Spanish","message":"60%","color":"red"}
+{"schemaVersion":1,"label":"Spanish","message":"59%","color":"red"}
diff --git a/docs/json/lang_hu.json b/docs/json/lang_hu.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Hungarian","message":"94%","color":"yellow"}
+{"schemaVersion":1,"label":"Hungarian","message":"93%","color":"yellow"}
diff --git a/docs/json/lang_nb.json b/docs/json/lang_nb.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Norwegian","message":"91%","color":"yellow"}
+{"schemaVersion":1,"label":"Norwegian","message":"90%","color":"yellow"}
diff --git a/docs/json/lang_pl.json b/docs/json/lang_pl.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Polish","message":"92%","color":"yellow"}
+{"schemaVersion":1,"label":"Polish","message":"91%","color":"yellow"}
diff --git a/docs/json/lang_uk.json b/docs/json/lang_uk.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Ukrainian","message":"54%","color":"red"}
+{"schemaVersion":1,"label":"Ukrainian","message":"53%","color":"red"}
diff --git a/docs/json/lang_vi.json b/docs/json/lang_vi.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"Vietnamese","message":"96%","color":"green"}
+{"schemaVersion":1,"label":"Vietnamese","message":"95%","color":"green"}
diff --git a/files/lang/be.po b/files/lang/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fheroes2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-04 12:56+0000\n"
+"POT-Creation-Date: 2024-01-13 09:39+0000\n"
 "PO-Revision-Date: 2022-09-23 16:01+0200\n"
 "Last-Translator: fheroes2 team <fhomm2@gmail.com>\n"
 "Language-Team: \n"
@@ -3208,6 +3208,42 @@ msgstr "Пстрыкніце сюды, каб выбраць сцэнар"
 msgid "Click to select this color."
 msgstr "Пстрыкніце сюды, каб выбраць сцэнар"
 
+#, fuzzy
+msgid "Select Dwelling:"
+msgstr "Хобіты"
+
+msgid "Mine placing"
+msgstr ""
+
+msgid ""
+"Resource\n"
+"type:"
+msgstr ""
+
+#, fuzzy
+msgid "%{mineName} appearance:"
+msgstr "%{race} %{name}"
+
+#, fuzzy
+msgid "Click to select %{object} as the resource generator to be placed."
+msgstr "Пстрыкніце сюды, каб выбраць сцэнар"
+
+#, fuzzy
+msgid "Select Mountain Object:"
+msgstr "Мова"
+
+#, fuzzy
+msgid "Select Rock Object:"
+msgstr "Мова"
+
+#, fuzzy
+msgid "Select Tree Object:"
+msgstr "Мова"
+
+#, fuzzy
+msgid "Select Power Up Object:"
+msgstr "Мова"
+
 msgid "Map Type:\n"
 msgstr ""
 
@@ -3529,15 +3565,30 @@ msgstr ""
 msgid "Artifacts cannot be placed on water."
 msgstr ""
 
+msgid "Mountains cannot be placed on water."
+msgstr ""
+
+msgid "Rocks cannot be placed on water."
+msgstr ""
+
+msgid "Trees cannot be placed on water."
+msgstr ""
+
 msgid "Ocean object must be placed on water."
 msgstr ""
 
 msgid "Towns cannot be placed on water."
 msgstr ""
 
+msgid "Mines cannot be placed on water."
+msgstr ""
+
 msgid "Dwellings cannot be placed on water."
 msgstr ""
 
+msgid "Power-ups cannot be placed on water."
+msgstr ""
+
 msgid "Used to place %{object}."
 msgstr ""
 

diff --git a/files/lang/bg.po b/files/lang/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fheroes2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-04 12:56+0000\n"
+"POT-Creation-Date: 2024-01-13 09:39+0000\n"
 "PO-Revision-Date: 2022-11-08 16:44+0000\n"
 "Last-Translator: fheroes2 team <fhomm2@gmail.com>\n"
 "Language-Team: \n"
@@ -3436,6 +3436,43 @@ msgstr "Кликни тук, за да избереш кой сценарий д
 msgid "Click to select this color."
 msgstr "Кликни тук, за да избереш кой сценарий да играеш."
 
+#, fuzzy
+msgid "Select Dwelling:"
+msgstr "Избери заклинание:"
+
+msgid "Mine placing"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Resource\n"
+"type:"
+msgstr "Ресурс"
+
+#, fuzzy
+msgid "%{mineName} appearance:"
+msgstr "%{name} %{race}"
+
+#, fuzzy
+msgid "Click to select %{object} as the resource generator to be placed."
+msgstr "Кликни тук, за да избереш кой сценарий да играеш."
+
+#, fuzzy
+msgid "Select Mountain Object:"
+msgstr "Океански обекти"
+
+#, fuzzy
+msgid "Select Rock Object:"
+msgstr "Океански обекти"
+
+#, fuzzy
+msgid "Select Tree Object:"
+msgstr "Океански обекти"
+
+#, fuzzy
+msgid "Select Power Up Object:"
+msgstr "Океански обекти"
+
 msgid "Map Type:\n"
 msgstr "Тип на карта:\n"
 
@@ -3765,6 +3802,18 @@ msgstr "Героите не могат да бъдат поставени на
 msgid "Artifacts cannot be placed on water."
 msgstr "Това заклинание не може да се направи на кораб."
 
+#, fuzzy
+msgid "Mountains cannot be placed on water."
+msgstr "Чудовищата не могат да се поставят върху вода."
+
+#, fuzzy
+msgid "Rocks cannot be placed on water."
+msgstr "Чудовищата не могат да се поставят върху вода."
+
+#, fuzzy
+msgid "Trees cannot be placed on water."
+msgstr "Това заклинание не може да се направи на кораб."
+
 #, fuzzy
 msgid "Ocean object must be placed on water."
 msgstr "Това заклинание не може да се направи на кораб."
@@ -3773,10 +3822,18 @@ msgstr "Това заклинание не може да се направи н
 msgid "Towns cannot be placed on water."
 msgstr "Чудовищата не могат да се поставят върху вода."
 
+#, fuzzy
+msgid "Mines cannot be placed on water."
+msgstr "Чудовищата не могат да се поставят върху вода."
+
 #, fuzzy
 msgid "Dwellings cannot be placed on water."
 msgstr "Чудовищата не могат да се поставят върху вода."
 
+#, fuzzy
+msgid "Power-ups cannot be placed on water."
+msgstr "Чудовищата не могат да се поставят върху вода."
+
 #, fuzzy
 msgid "Used to place %{object}."
 msgstr "Използва се за поставяне на герой."

diff --git a/files/lang/cs.po b/files/lang/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fheroes2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-04 12:56+0000\n"
+"POT-Creation-Date: 2024-01-13 09:39+0000\n"
 "PO-Revision-Date: 2023-09-24 16:05+0200\n"
 "Last-Translator: fheroes2 team <fhomm2@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -3401,6 +3401,43 @@ msgstr "Kliknout sem pro výběr scénáře."
 msgid "Click to select this color."
 msgstr "Kliknout sem pro výběr scénáře."
 
+#, fuzzy
+msgid "Select Dwelling:"
+msgstr "Seslat kouzlo"
+
+msgid "Mine placing"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Resource\n"
+"type:"
+msgstr "Zdroje"
+
+#, fuzzy
+msgid "%{mineName} appearance:"
+msgstr "%{name} z rodu %{race}"
+
+#, fuzzy
+msgid "Click to select %{object} as the resource generator to be placed."
+msgstr "Kliknout sem pro výběr scénáře."
+
+#, fuzzy
+msgid "Select Mountain Object:"
+msgstr "Artefakt"
+
+#, fuzzy
+msgid "Select Rock Object:"
+msgstr "Artefakt"
+
+#, fuzzy
+msgid "Select Tree Object:"
+msgstr "Artefakt"
+
+#, fuzzy
+msgid "Select Power Up Object:"
+msgstr "Artefakt"
+
 #, fuzzy
 msgid "Map Type:\n"
 msgstr "Velikost mapy"
@@ -3722,17 +3759,37 @@ msgstr ""
 msgid "Artifacts cannot be placed on water."
 msgstr ""
 
+#, fuzzy
+msgid "Mountains cannot be placed on water."
+msgstr "Toto město nemůže být povýšeno na hrad."
+
+#, fuzzy
+msgid "Rocks cannot be placed on water."
+msgstr "Toto město nemůže být povýšeno na hrad."
+
+#, fuzzy
+msgid "Trees cannot be placed on water."
+msgstr "Toto město nemůže být povýšeno na hrad."
+
 msgid "Ocean object must be placed on water."
 msgstr ""
 
 #, fuzzy
 msgid "Towns cannot be placed on water."
 msgstr "Toto město nemůže být povýšeno na hrad."
 
+#, fuzzy
+msgid "Mines cannot be placed on water."
+msgstr "Toto město nemůže být povýšeno na hrad."
+
 #, fuzzy
 msgid "Dwellings cannot be placed on water."
 msgstr "Toto město nemůže být povýšeno na hrad."
 
+#, fuzzy
+msgid "Power-ups cannot be placed on water."
+msgstr "Toto město nemůže být povýšeno na hrad."
+
 #, fuzzy
 msgid "Used to place %{object}."
 msgstr "Nalezení ultimátního artefaktu."

diff --git a/files/lang/de.po b/files/lang/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-04 12:56+0000\n"
+"POT-Creation-Date: 2024-01-13 09:39+0000\n"
 "PO-Revision-Date: 2023-12-22 00:32+0100\n"
 "Last-Translator: fheroes2 team <fhomm2@gmail.com>\n"
 "Language-Team: \n"
@@ -3445,6 +3445,43 @@ msgstr "Hier klicken, um auszuwählen, welches Szenario gespielt werden soll."
 msgid "Click to select this color."
 msgstr "Hier klicken, um auszuwählen, welches Szenario gespielt werden soll."
 
+#, fuzzy
+msgid "Select Dwelling:"
+msgstr "Zauberspruch auswählen:"
+
+msgid "Mine placing"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Resource\n"
+"type:"
+msgstr "Ressource"
+
+#, fuzzy
+msgid "%{mineName} appearance:"
+msgstr "%{name} (%{race})"
+
+#, fuzzy
+msgid "Click to select %{object} as the resource generator to be placed."
+msgstr "Hier klicken, um auszuwählen, welches Szenario gespielt werden soll."
+
+#, fuzzy
+msgid "Select Mountain Object:"
+msgstr "Ozean-Objekte"
+
+#, fuzzy
+msgid "Select Rock Object:"
+msgstr "Ozean-Objekte"
+
+#, fuzzy
+msgid "Select Tree Object:"
+msgstr "Ozean-Objekte"
+
+#, fuzzy
+msgid "Select Power Up Object:"
+msgstr "Ozean-Objekte"
+
 msgid "Map Type:\n"
 msgstr "Kartentyp:\n"
 
@@ -3780,6 +3817,18 @@ msgstr ""
 msgid "Artifacts cannot be placed on water."
 msgstr "Monster können nicht auf Wasser plaziert werden."
 
+#, fuzzy
+msgid "Mountains cannot be placed on water."
+msgstr "Monster können nicht auf Wasser plaziert werden."
+
+#, fuzzy
+msgid "Rocks cannot be placed on water."
+msgstr "Monster können nicht auf Wasser plaziert werden."
+
+#, fuzzy
+msgid "Trees cannot be placed on water."
+msgstr "Monster können nicht auf Wasser plaziert werden."
+
 #, fuzzy
 msgid "Ocean object must be placed on water."
 msgstr "Monster können nicht auf Wasser plaziert werden."
@@ -3788,10 +3837,18 @@ msgstr "Monster können nicht auf Wasser plaziert werden."
 msgid "Towns cannot be placed on water."
 msgstr "Monster können nicht auf Wasser plaziert werden."
 
+#, fuzzy
+msgid "Mines cannot be placed on water."
+msgstr "Monster können nicht auf Wasser plaziert werden."
+
 #, fuzzy
 msgid "Dwellings cannot be placed on water."
 msgstr "Monster können nicht auf Wasser plaziert werden."
 
+#, fuzzy
+msgid "Power-ups cannot be placed on water."
+msgstr "Monster können nicht auf Wasser plaziert werden."
+
 #, fuzzy
 msgid "Used to place %{object}."
 msgstr "Wird verwendet, um einen Helden zu platzieren."