From 79e0007799401ed4275cf62df1a0be85f7d1d548 Mon Sep 17 00:00:00 2001 From: Oleg Derevenetz Date: Wed, 20 Mar 2024 03:40:19 +0300 Subject: [PATCH 1/3] Update Windows & Android dependencies (#8497) --- android/build.gradle | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 2 +- script/android/install_packages.bat | 2 +- script/android/install_packages.sh | 2 +- script/windows/install_packages.bat | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 29c83acaf83..96b36ef186f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' + classpath 'com.android.tools.build:gradle:8.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 0b1ef9ae9de..f2308e41b5f 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Nov 11 18:20:34 PST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/script/android/install_packages.bat b/script/android/install_packages.bat index 1644f5092d9..35e2191ba24 100644 --- a/script/android/install_packages.bat +++ b/script/android/install_packages.bat @@ -23,7 +23,7 @@ set DST_DIR=%~dp0\..\..\android set PKG_FILE=android.zip -set PKG_FILE_SHA256=F2D8EA526594F0CE8569ED003EA3BA28D17DAC6B5A57337DA99742F580DF19B0 +set PKG_FILE_SHA256=A966B73F745F79BCC3868A621597B2EDD3BE5FE29FC83FE0F6640BA0FE00085D set PKG_URL=https://github.com/fheroes2/fheroes2-prebuilt-deps/releases/download/android-deps/%PKG_FILE% set PKG_TLS=[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 diff --git a/script/android/install_packages.sh b/script/android/install_packages.sh index d607c6f1fb8..b6a0246ca67 100644 --- a/script/android/install_packages.sh +++ b/script/android/install_packages.sh @@ -23,7 +23,7 @@ set -e -o pipefail PKG_FILE="android.zip" -PKG_FILE_SHA256="f2d8ea526594f0ce8569ed003ea3ba28d17dac6b5a57337da99742f580df19b0" +PKG_FILE_SHA256="a966b73f745f79bcc3868a621597b2edd3be5fe29fc83fe0f6640ba0fe00085d" PKG_URL="https://github.com/fheroes2/fheroes2-prebuilt-deps/releases/download/android-deps/$PKG_FILE" TMP_DIR="$(mktemp -d)" diff --git a/script/windows/install_packages.bat b/script/windows/install_packages.bat index 0536027472d..fe22761f37d 100644 --- a/script/windows/install_packages.bat +++ b/script/windows/install_packages.bat @@ -23,7 +23,7 @@ set DST_DIR=%~dp0\..\..\VisualStudio\packages set PKG_FILE=windows.zip -set PKG_FILE_SHA256=78D47801C6E0C951FB85BD79A1EFE3BB3CCE7D651CD95F3F6F2B76FE4D19330C +set PKG_FILE_SHA256=E3ECA565ECD6A3854853CCD374AAFE017BED9C631CCD90E7F62BAE9F971C29FE set PKG_URL=https://github.com/fheroes2/fheroes2-prebuilt-deps/releases/download/windows-deps/%PKG_FILE% set PKG_TLS=[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 From 8656e4c13977944a1d848d199ba21f28390d7e4a Mon Sep 17 00:00:00 2001 From: Alex Fikl Date: Wed, 20 Mar 2024 03:59:18 +0200 Subject: [PATCH 2/3] Update Romanian translations (#8496) --- files/lang/ro.po | 118 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 81 insertions(+), 37 deletions(-) diff --git a/files/lang/ro.po b/files/lang/ro.po index 12937a56cb6..4dbfee9f45b 100644 --- a/files/lang/ro.po +++ b/files/lang/ro.po @@ -29,164 +29,181 @@ msgid "" "NEW\n" "GAME" msgstr "" +"JOC\n" +"NOU" msgid "" "SAVE\n" "GAME" msgstr "" +"SALVEAZĂ\n" +"JOCUL" msgid "" "LOAD\n" "GAME" msgstr "" +"ÎNCARCĂ\n" +"JOCUL" msgid "INFO" -msgstr "" +msgstr "INFO" msgid "QUIT" -msgstr "" +msgstr "ÎNCHIDE" msgid "CANCEL" -msgstr "" +msgstr "RENUNȚĂ" msgid "OKAY" -msgstr "" +msgstr "OKAY" msgid "smallerButton|OKAY" -msgstr "" +msgstr "OKAY" msgid "ACCEPT" -msgstr "" +msgstr "ACCEPTĂ" msgid "DECLINE" -msgstr "" +msgstr "REFUZĂ" msgid "LEARN" -msgstr "" +msgstr "ÎNVAȚĂ" msgid "TRADE" -msgstr "" +msgstr "TROC" msgid "YES" -msgstr "" +msgstr "DA" msgid "NO" -msgstr "" +msgstr "NU" msgid "EXIT" -msgstr "" +msgstr "EXIT" msgid "smallerButton|EXIT" -msgstr "" +msgstr "EXIT" msgid "DISMISS" -msgstr "" +msgstr "RENUNȚĂ" msgid "UPGRADE" -msgstr "" +msgstr "AMELIOREAZĂ" msgid "RESTART" -msgstr "" +msgstr "RESTART" msgid "HEROES" -msgstr "" +msgstr "EROI" msgid "" "TOWNS/\n" "CASTLES" msgstr "" +"ORAȘE\n" +"CASTELE" msgid "S" -msgstr "" +msgstr "S" msgid "M" -msgstr "" +msgstr "M" msgid "L" -msgstr "" +msgstr "L" msgid "X-L" -msgstr "" +msgstr "X-L" msgid "ALL" -msgstr "" +msgstr "TOATE" msgid "SELECT" -msgstr "" +msgstr "SELECTEAZĂ" msgid "" "STANDARD\n" "GAME" msgstr "" +"JOC\n" +"STANDARD" msgid "" "CAMPAIGN\n" "GAME" -msgstr "" +msgstr "CAMPANIE" msgid "" "MULTI-\n" "PLAYER\n" "GAME" msgstr "" +"JOC\n" +"MULTI-\n" +"PLAYER" msgid "CONFIG" -msgstr "" +msgstr "CONFIG" msgid "" "ORIGINAL\n" "CAMPAIGN" msgstr "" +"CAMPANIE\n" +"ORIGINALĂ" msgid "" "EXPANSION\n" "CAMPAIGN" msgstr "" +"CAMPANIE\n" +"EXPANSIUNE" msgid "HOT SEAT" msgstr "" msgid "2 PLAYERS" -msgstr "" +msgstr "2 JUCĂTORI" msgid "3 PLAYERS" -msgstr "" +msgstr "3 JUCĂTORI" msgid "4 PLAYERS" -msgstr "" +msgstr "4 JUCĂTORI" msgid "5 PLAYERS" -msgstr "" +msgstr "5 JUCĂTORI" msgid "6 PLAYERS" -msgstr "" +msgstr "6 JUCĂTORI" msgid "GIFT" msgstr "OFERĂ" msgid "MAX" -msgstr "" +msgstr "MAX" msgid "DIFFICULTY" msgstr "DIFICULTATE" msgid "VIEW INTRO" -msgstr "" +msgstr "VEZI INTRO" msgid "MIN" msgstr "MIN" msgid "RESET" -msgstr "" +msgstr "RESET" msgid "START" -msgstr "" +msgstr "START" msgid "CASTLE" -msgstr "" +msgstr "CASTEL" msgid "TOWN" -msgstr "" +msgstr "ORAȘ" msgid "" "D\n" @@ -197,6 +214,13 @@ msgid "" "S\n" "S" msgstr "" +"R\n" +"E\n" +"N\n" +"U\n" +"N\n" +"Ț\n" +"Ă" msgid "" "E\n" @@ -204,6 +228,10 @@ msgid "" "I\n" "T" msgstr "" +"E\n" +"X\n" +"I\n" +"T" msgid "" "C\n" @@ -215,6 +243,14 @@ msgid "" "G\n" "N" msgstr "" +"C\n" +"A\n" +"M\n" +"P\n" +"A\n" +"N\n" +"I\n" +"E" msgid "" "S\n" @@ -226,6 +262,14 @@ msgid "" "R\n" "D" msgstr "" +"S\n" +"T\n" +"A\n" +"N\n" +"D\n" +"A\n" +"R\n" +"D" msgid "Warrior" msgstr "Războinic" @@ -257,7 +301,7 @@ msgid "" "A pack of\n" "%{monster}" msgstr "" -"O haita de\n" +"O haită de\n" "%{monster}" msgid "" From 49cb818e22227717f5d9ff396e7abaad42a1500a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 11:05:07 +0800 Subject: [PATCH 3/3] Update translation files (#8498) --- docs/json/lang_ro.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/lang_ro.json b/docs/json/lang_ro.json index ca03cd9ab85..91e0af7c4ee 100644 --- a/docs/json/lang_ro.json +++ b/docs/json/lang_ro.json @@ -1 +1 @@ -{"schemaVersion":1,"label":"Romanian","message":"7%","color":"red"} +{"schemaVersion":1,"label":"Romanian","message":"8%","color":"red"}