diff --git a/desktop/build-linux-64-steam.json b/desktop/build-linux-64-steam.json index 8c5c404a..907d00ff 100644 --- a/desktop/build-linux-64-steam.json +++ b/desktop/build-linux-64-steam.json @@ -5,7 +5,7 @@ "executable": "Tick's Tales", "classpath": ["target/advent-standalone.jar"], "mainclass": "advent.core.desktop_launcher", - "resources": ["steam_appid.txt"], + "resources": ["steam_appid.txt", "resources/icon"], "minimizejre": "soft", "output": "target/linux/amd64" } diff --git a/desktop/build-linux-64.json b/desktop/build-linux-64.json index 39069e18..25536b2f 100644 --- a/desktop/build-linux-64.json +++ b/desktop/build-linux-64.json @@ -5,7 +5,7 @@ "executable": "Tick's Tales", "classpath": ["target/advent-standalone.jar"], "mainclass": "advent.core.desktop_launcher", - "resources": ["steam_appid.txt"], + "resources": ["steam_appid.txt", "resources/icon"], "minimizejre": "soft", "output": "target/linux/amd64" } diff --git a/desktop/build-windows-steam.json b/desktop/build-windows-steam.json index e39d91b1..f079926b 100644 --- a/desktop/build-windows-steam.json +++ b/desktop/build-windows-steam.json @@ -4,7 +4,7 @@ "jdk": "./jvms/windows64.zip", "executable": "TicksTales", "mainclass": "advent.core.desktop_launcher", - "resources": ["steam_appid.txt"], + "resources": ["steam_appid.txt", "resources/icon"], "classpath": ["target/advent-standalone.jar"], "minimizejre": "soft", "output": "target/windows/" diff --git a/desktop/build-windows.json b/desktop/build-windows.json index e4880a26..62d0b11f 100644 --- a/desktop/build-windows.json +++ b/desktop/build-windows.json @@ -4,7 +4,7 @@ "jdk": "./jvms/windows64.zip", "executable": "TicksTales", "mainclass": "advent.core.desktop_launcher", - "resources": ["steam_appid.txt"], + "resources": ["steam_appid.txt", "resources/icon"], "classpath": ["target/advent-standalone.jar"], "minimizejre": "soft", "output": "target/windows/" diff --git a/desktop/content-builder/builder_osx/crashhandler.dylib b/desktop/content-builder/builder_osx/crashhandler.dylib index 770d04b7..52806fa0 100755 Binary files a/desktop/content-builder/builder_osx/crashhandler.dylib and b/desktop/content-builder/builder_osx/crashhandler.dylib differ diff --git a/desktop/content-builder/builder_osx/libaudio.dylib b/desktop/content-builder/builder_osx/libaudio.dylib index 3c815429..78f2013b 100755 Binary files a/desktop/content-builder/builder_osx/libaudio.dylib and b/desktop/content-builder/builder_osx/libaudio.dylib differ diff --git a/desktop/content-builder/builder_osx/libtier0_s.dylib b/desktop/content-builder/builder_osx/libtier0_s.dylib index 59faf45f..14c92aff 100755 Binary files a/desktop/content-builder/builder_osx/libtier0_s.dylib and b/desktop/content-builder/builder_osx/libtier0_s.dylib differ diff --git a/desktop/content-builder/builder_osx/libvstdlib_s.dylib b/desktop/content-builder/builder_osx/libvstdlib_s.dylib index 0cca0959..bc38c998 100755 Binary files a/desktop/content-builder/builder_osx/libvstdlib_s.dylib and b/desktop/content-builder/builder_osx/libvstdlib_s.dylib differ diff --git a/desktop/content-builder/builder_osx/package/steam_cmd_osx.installed b/desktop/content-builder/builder_osx/package/steam_cmd_osx.installed index 6339df08..c09096f5 100644 --- a/desktop/content-builder/builder_osx/package/steam_cmd_osx.installed +++ b/desktop/content-builder/builder_osx/package/steam_cmd_osx.installed @@ -1,4 +1,4 @@ -crashhandler.dylib,327168;1608260582;4072705574 +crashhandler.dylib,269664;1626824210;2541537603 Frameworks/Breakpad.framework/,-1;1477950302;0 Frameworks/Breakpad.framework/Breakpad,-2;1283201464;1199629470 Frameworks/Breakpad.framework/Headers,-2;1283201464;2393740531 @@ -60,44 +60,44 @@ Frameworks/Breakpad.framework/Versions/A/Resources/crash_report_sender.app/Conte Frameworks/Breakpad.framework/Versions/A/Resources/Info.plist,1228;1477950302;2088164349 Frameworks/Breakpad.framework/Versions/A/Resources/Inspector,55700;1477950302;3995236228 Frameworks/Breakpad.framework/Versions/Current,-2;1283201464;3554254475 -libaudio.dylib,281872;1608260582;1615657088 +libaudio.dylib,196176;1626824210;3914268500 libsteaminput.dylib,89872;1528433788;2801920434 -libtier0_s.dylib,417408;1608260582;1458381962 -libvstdlib_s.dylib,609088;1608260582;4175414582 -public/,-1;1600458368;0 -public/steambootstrapper_brazilian.txt,4586;1599787342;435265056 -public/steambootstrapper_bulgarian.txt,6462;1599787342;871101403 -public/steambootstrapper_czech.txt,4776;1599787342;2517150828 -public/steambootstrapper_danish.txt,4337;1599787342;3747600605 -public/steambootstrapper_dutch.txt,4339;1599787342;2658776387 -public/steambootstrapper_english.txt,4042;1567106948;705636240 -public/steambootstrapper_finnish.txt,4569;1599787342;1100477458 -public/steambootstrapper_french.txt,4824;1599787342;263383177 -public/steambootstrapper_german.txt,4730;1599787342;2471385224 -public/steambootstrapper_greek.txt,6210;1599787342;2897296743 -public/steambootstrapper_hungarian.txt,4764;1600458368;1931668746 -public/steambootstrapper_italian.txt,4686;1599787342;131070742 -public/steambootstrapper_japanese.txt,5457;1599787342;2112085630 -public/steambootstrapper_korean.txt,4776;1599787342;2541923810 -public/steambootstrapper_koreana.txt,4776;1599787342;2541923810 -public/steambootstrapper_latam.txt,4650;1599787342;2818400559 -public/steambootstrapper_norwegian.txt,4319;1599787342;3178737914 -public/steambootstrapper_polish.txt,4549;1600458368;2131648902 -public/steambootstrapper_portuguese.txt,4540;1599787342;1537129431 -public/steambootstrapper_romanian.txt,4577;1599787342;1945477159 -public/steambootstrapper_russian.txt,6084;1599787342;79310862 -public/steambootstrapper_schinese.txt,4079;1599787342;3710048221 -public/steambootstrapper_spanish.txt,4649;1599787342;1348116077 -public/steambootstrapper_swedish.txt,4343;1599787342;395261697 -public/steambootstrapper_tchinese.txt,4056;1599787342;4236189440 -public/steambootstrapper_thai.txt,7358;1599787342;1672752677 -public/steambootstrapper_turkish.txt,4502;1599787342;3593600711 -public/steambootstrapper_ukrainian.txt,6142;1599787342;546430067 -public/steambootstrapper_vietnamese.txt,4937;1599787342;3536082544 -steamclient.dylib,90285552;1608260584;2907061343 -steamcmd,4649616;1608260584;3739166325 +libtier0_s.dylib,366512;1626824210;2142114133 +libvstdlib_s.dylib,525328;1626824212;1153798541 +public/,-1;1615498476;0 +public/steambootstrapper_brazilian.txt,4579;1610589776;2945962788 +public/steambootstrapper_bulgarian.txt,6450;1615498476;573256223 +public/steambootstrapper_czech.txt,4769;1610589774;3540247094 +public/steambootstrapper_danish.txt,4330;1610589774;1603943118 +public/steambootstrapper_dutch.txt,4332;1610589774;1823643073 +public/steambootstrapper_english.txt,4113;1610129318;2002058579 +public/steambootstrapper_finnish.txt,4562;1610589774;4160826347 +public/steambootstrapper_french.txt,4817;1610589774;1705022547 +public/steambootstrapper_german.txt,4723;1610589774;806216237 +public/steambootstrapper_greek.txt,6203;1610589774;655592863 +public/steambootstrapper_hungarian.txt,4757;1610589774;158680991 +public/steambootstrapper_italian.txt,4679;1610589776;3717497750 +public/steambootstrapper_japanese.txt,5455;1612564870;262655608 +public/steambootstrapper_korean.txt,4769;1610561412;614365656 +public/steambootstrapper_koreana.txt,4769;1610561412;614365656 +public/steambootstrapper_latam.txt,4643;1610589776;3044857096 +public/steambootstrapper_norwegian.txt,4312;1610589774;2157669839 +public/steambootstrapper_polish.txt,4542;1610589774;2472231859 +public/steambootstrapper_portuguese.txt,4533;1610589774;4032431559 +public/steambootstrapper_romanian.txt,4570;1610589776;2606193458 +public/steambootstrapper_russian.txt,6077;1610589776;935885346 +public/steambootstrapper_schinese.txt,4072;1610589774;879153330 +public/steambootstrapper_spanish.txt,4642;1610589776;1362390230 +public/steambootstrapper_swedish.txt,4336;1610589776;1780188147 +public/steambootstrapper_tchinese.txt,4049;1610589774;745943745 +public/steambootstrapper_thai.txt,7351;1610589776;1905597739 +public/steambootstrapper_turkish.txt,4495;1610589776;3145753921 +public/steambootstrapper_ukrainian.txt,6135;1610589776;937082620 +public/steambootstrapper_vietnamese.txt,4930;1610589776;400653706 +steamclient.dylib,96625916;1626824212;1455111241 +steamcmd,4602256;1626824212;1006338243 steamcmd.sh,1173;1606003422;3451214996 -steamconsole.dylib,460960;1608260584;3702974498 +steamconsole.dylib,358304;1626824212;2028804471 OSVER=-83 VERSION=3 -SHA1=1E2C8ECDDE51B6F49C69D151D14D37F363234E24 +SHA1=B22E139D678D48DCA7687428A2C587B960637FEE diff --git a/desktop/content-builder/builder_osx/package/steam_cmd_osx.manifest b/desktop/content-builder/builder_osx/package/steam_cmd_osx.manifest index 8ee17001..a1af0b05 100644 --- a/desktop/content-builder/builder_osx/package/steam_cmd_osx.manifest +++ b/desktop/content-builder/builder_osx/package/steam_cmd_osx.manifest @@ -1,19 +1,19 @@ "osx" { - "version" "1608497921" + "version" "1626823972" "steamcmd_public_all" { - "file" "steamcmd_public_all.zip.e61ce36efab3810390b5b5f55ee433f1fc7a04af" - "size" "49303" - "sha2" "74901c1f1b77aca874f3ecef4410223731cfe80e33f45f1d7e30abf5e0ef0ea0" + "file" "steamcmd_public_all.zip.716674556427db82df7272603a00b5affcd9bb7b" + "size" "49247" + "sha2" "ad8cec394baab88aaad803421ca64af61f8b2d6a80a2abdc9cbdd07fbdc0abdd" } "steamcmd_bins_osx" { - "file" "steamcmd_bins_osx.zip.3fcb619cc295c28bf18ee03080fbf6768be50ad8" - "size" "24170688" - "sha2" "5fd242786d0cf05c8c80d8ade25d73f842f5f1cf06e552a3274cb24f8887c9f8" - "zipvz" "steamcmd_bins_osx.zip.vz.9eb383d43056b1e8ab9ac1b0292344fb1ea4f99b_15178433" - "sha2vz" "a5b08572a9362b2ad468970caeb3fd67fa8f3067fdb272e096a313420f4fc397" + "file" "steamcmd_bins_osx.zip.15f160164451aa813be1546bb08d72a968782a1a" + "size" "25973618" + "sha2" "fb9d6ab5ac932563802bbbfc705a8b81aa1b751305fd51f3bbaab6053450dfc3" + "zipvz" "steamcmd_bins_osx.zip.vz.bf1b6aba14e68f4a70fd5287013639beacece52e_16458149" + "sha2vz" "bd83cbcb54b21000c199f0fdcaa3b40e45dfd5ed649000391f05fa7c7c3536b4" } "steamcmd_breakpad_osx" { @@ -25,19 +25,19 @@ } "steamcmd_osx" { - "file" "steamcmd_osx.zip.9c00dd9d312e75dba7c0315fb2ef8b0b063703f2" - "size" "1835272" - "sha2" "08d15ac3fb894d2f3e40c768c2f361d512a080fef17e73a43fac2a0dd37bf356" - "zipvz" "steamcmd_osx.zip.vz.05364999561c00efc46fc902a93b07475dbe013b_1469691" - "sha2vz" "d559a743435c5c17215f5d4b990c5b74e487627ddd5e7f0074c604202399d8d8" + "file" "steamcmd_osx.zip.7f44a675f3c221dd94daf97555a51834dec10131" + "size" "2022601" + "sha2" "95b4a8198d709d0038732af7b5bd553cd563f59fd1f6ee4904df5a584e7a3e95" + "zipvz" "steamcmd_osx.zip.vz.105071527934d4edecbd30685bb49e1133b2cc86_1641691" + "sha2vz" "54b09d50129e0e5820f85536bf31df1d9f41a754eef81b8f3267a9aae3cd7675" "IsBootstrapperPackage" "1" } } "kvsign2" { - "osx" "ecb07ed1192132587afedc36b62e7cc9c92a2cd640c38e248a5bed2deb0ab914cbf088dd11454bf4c0f656504335df6b8132061f2feddf5a810f9f1938893707" + "osx" "dd8213b467791e75c082e4cae8b559932f47ce37940275264c9e1e8efddc03da60f12700417dfde540442d2172b03bc0d1215db379cd4884fdd7340670c4fb06" } "kvsignatures" { - "osx" "ad77fb4e7292bfac0435752c0c8afa61ba6e175d59b3143836124ab0109903a7eb0109560a9f11f06b92dd4df4f1f19fb51934443feaf3d32b23f20b8f3aaf19641d90aa2653ccee330c2a13362e68643846434a6366d65f1fc00a413976c02fe3fcab82ec7b6a44d1efb01c9814e1a0c76e9a5212719bc9c37e30803a93a147" + "osx" "9d29674c2e3903796f08bedc312377f867ca992eb51e06797a8fa6901e98442f6745cdf002187f7834c6815af71f79fa8da94405e50e3152b5646c06efd81b8986fc229c0ab8947dc9e8366bdd1fb8bbbd0d2723838b8ea9bc8bba5768c3390563a529484ba8503d16bae61377ac3a62eaa9f54f5e1c6301942b30ec5d36529f" } diff --git a/desktop/content-builder/builder_osx/package/steamcmd_bins_osx.zip.vz.9eb383d43056b1e8ab9ac1b0292344fb1ea4f99b_15178433 b/desktop/content-builder/builder_osx/package/steamcmd_bins_osx.zip.vz.9eb383d43056b1e8ab9ac1b0292344fb1ea4f99b_15178433 deleted file mode 100755 index cdf5599e..00000000 Binary files a/desktop/content-builder/builder_osx/package/steamcmd_bins_osx.zip.vz.9eb383d43056b1e8ab9ac1b0292344fb1ea4f99b_15178433 and /dev/null differ diff --git a/desktop/content-builder/builder_osx/package/steamcmd_osx.zip.vz.05364999561c00efc46fc902a93b07475dbe013b_1469691 b/desktop/content-builder/builder_osx/package/steamcmd_osx.zip.vz.05364999561c00efc46fc902a93b07475dbe013b_1469691 deleted file mode 100755 index 4a831bc6..00000000 Binary files a/desktop/content-builder/builder_osx/package/steamcmd_osx.zip.vz.05364999561c00efc46fc902a93b07475dbe013b_1469691 and /dev/null differ diff --git a/desktop/content-builder/builder_osx/package/steamcmd_public_all.zip.e61ce36efab3810390b5b5f55ee433f1fc7a04af b/desktop/content-builder/builder_osx/package/steamcmd_public_all.zip.e61ce36efab3810390b5b5f55ee433f1fc7a04af deleted file mode 100755 index b17d42a1..00000000 Binary files a/desktop/content-builder/builder_osx/package/steamcmd_public_all.zip.e61ce36efab3810390b5b5f55ee433f1fc7a04af and /dev/null differ diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_brazilian.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_brazilian.txt index 401ce2bc..d4d05e23 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_brazilian.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_brazilian.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Uma instância do %appname% já está rodando neste computador em outra conta de usuário" "SteamBootstrapper_MoveContentDir_DestExists" "O %appname% alterou o local onde guarda o conteúdo de jogos - de \"~/Documents/Steam Content\" para \"~/Library/Application Support/Steam/SteamApps\". Você tem arquivos de jogo no local original e o %appname% não conseguiu mover os arquivos porque já existem arquivos no novo local. Você pode precisar mover os arquivos manualmente ou apagar os arquivos antigos e baixar os jogos novamente. Continuar mesmo assim?" "SteamBootstrapper_MoveContentDir_CopyError" "O %appname% alterou o local onde guarda o conteúdo de jogos - de \"~/Documents/Steam Content\" para \"~/Library/Application Support/Steam/SteamApps\". Você tem arquivos de jogo no local original e o %appname% não conseguiu mover os arquivos porque já existem arquivos no novo local. Você pode precisar mover os arquivos manualmente ou apagar os arquivos antigos e baixar os jogos novamente. Continuar mesmo assim?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Cancelar" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% — Erro fatal" -"SteamBootstrapper_Warning_Title" "%appname% — Aviso" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Cancelar" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% — Erro fatal" +"SteamBootstrapper_Warning_Title" "%appname% — Aviso" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% não é mais compatível com a versão atual do seu sistema operacional." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_bulgarian.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_bulgarian.txt index d810fe58..cb479d15 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_bulgarian.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_bulgarian.txt @@ -4,11 +4,11 @@ "SteamBootstrapper_UpdatingSteam" "Обновяване на %appname%…" "SteamBootstrapper_ElevationPrompt" "%appname% трябва да се обнови преди пускането." "SteamBootstrapper_ReadOnlyInstallOSX" "%appname% няма възможност да записва в папката си. Уверете се, че не се опитвате да стартирате от изображението на диска." -"SteamBootstrapper_RunFromDiskImageOSX" "Моля, преместете %appname% във Вашата папка с приложения, преди да го пуснете." +"SteamBootstrapper_RunFromDiskImageOSX" "Моля, провлачете %appname% в папката Ви с приложения, преди да го пуснете." "SteamBootstrapper_ReadOnlyInstall" "%appname% няма възможност да записва в папката си." "SteamBootstrapper_InstallDirNotASCII" "%appname% не може да бъде пуснато от папка, чийто път съдържа символи, които не са на английски. Моля, преинсталирайте %appname% в папката по подразбиране" "SteamBootstrapper_InstallDirIncompatible" "%appname% не може да се пусне от папка, съдържаща символи, които не са ASCII, в тази версия на Windows. Моля, преинсталирайте %appname% към папката по подразбиране или направете инсталация на Windows 7 или по-нова версия." -"SteamBootstrapper_InsufficientDiskSpace" "%appname% се нуждае от %nMegaBytes%MB свободно място, за да бъде обновено." +"SteamBootstrapper_InsufficientDiskSpace" "%appname% се нуждае от %nMegaBytes% MB свободно дисково пространство, за да бъде обновено." "SteamBootstrapper_FailedManifestLoad" "Неуспешно зареждане на манифеста за пакета." "SteamBootstrapper_FailedManifestVerify" "Неуспешно потвърждаване на манифеста за пакета." "SteamBootstrapper_FailedManifestSave" "Неуспешно запазване на манифеста за пакета." @@ -16,8 +16,8 @@ "SteamBootstrapper_CorruptPackageFile" "Повреден файл на пакета (%pkgName%)." "SteamBootstrapper_FailedPackageUnzip" "Неуспешно разархивиране на пакета (%pkgName%)." "SteamBootstrapper_UpdateApplyFail" "Неуспешно прилагане на обновлението, връщане…" -"SteamBootstrapper_UpdateCleanup" "Почистване…" -"SteamBootstrapper_UpdateCleanupFail" "Неуспешно почистване след обновяването, продължаване…" +"SteamBootstrapper_UpdateCleanup" "Разчистване…" +"SteamBootstrapper_UpdateCleanupFail" "Неуспешно разчистване след обновяването, продължаване…" "SteamBootstrapper_UpdateFinalizeFail" "Неуспешно записване на манифеста за инсталацията." "SteamBootstrapper_UpdateComplete" "Обновяването е завършено, пускане на %appname%..." "SteamBootstrapper_UpdateChecking" "Проверяване за достъпни обновления…" @@ -29,16 +29,16 @@ "SteamBootstrapper_InstallVerify" "Потвърждаване на инсталацията…" "SteamBootstrapper_DownloadComplete" "Свалянето е завършено." "SteamBootstrapper_PercentComplete" "%percent%%% завършено" -"SteamBootstrapper_NoNetwork" "%appname% трябва да е на линия, за да се обнови. Моля, проверете интернет връзката си и опитайте отново." +"SteamBootstrapper_NoNetwork" "Нужно е %appname% да бъде на линия, за да се обнови. Моля, проверете своята интернет връзка и опитайте отново." "SteamBootstrapper_FailedMkdir" "Неуспешно създаване на директория %dirname%, получена грешка %errno%" "SteamBootstrapper_FailedDownloadHTTPError" "Свалянето е неуспешно: http грешка %errno%" "SteamBootstrapper_AlreadyRunningError" "Инстанция на %appname% вече е пусната от този компютър, но под различен потребителски акаунт." -"SteamBootstrapper_MoveContentDir_DestExists" "%appname% е променило къде се запазва съдържанието за играта от „~/Documents/%appname% Content“ на „~/Library/Application Support/%appname%/%appname%Apps“. Имате игрални файлове в първоначалното местонахождение и %appname% не успя да премести файловете, тъй като вече съществуват други такива в новото място. Възможно е да се наложи ръчното им преместване или изтриването на старите и игрите да бъдат свалени отново. Продължаване въпреки това?" -"SteamBootstrapper_MoveContentDir_CopyError" "%appname% е променило къде се запазва съдържанието за играта от „~/Documents/%appname% Content“ на „~/Library/Application Support/%appname%/%appname%Apps“. Имате игрални файлове в първоначалното местонахождение и %appname% нямаше възможност да премести файловете. Възможно е да се наложи ръчното им преместване или изтриването на старите и игрите да бъдат свалени отново. Продължаване въпреки това?" -"SteamBootstrapper_OK" "Добре" -"SteamBootstrapper_Cancel" "Отказ" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% — Фатална грешка" -"SteamBootstrapper_Warning_Title" "%appname% — Предупреждение" +"SteamBootstrapper_MoveContentDir_DestExists" "%appname% промени къде съхранява игралното съдържание от „~/Documents/Steam Content“ на „~/Library/Application Support/Steam/SteamApps“. Разполагате с игрални файлове в първоначалното местонахождение, а Steam не успя да ги премести, тъй като вече съществуват други такива в новото място. Възможно е да се наложи ръчното им преместване или изтриването на старите файлове, а игрите да бъдат свалени отново. Продължаване въпреки това?" +"SteamBootstrapper_MoveContentDir_CopyError" "Steam промени къде съхранява игралното съдържание от „~/Documents/Steam Content“ на „~/Library/Application Support/Steam/SteamApps“. Разполагате с игрални файлове в първоначалното местонахождение, а Steam не успя да ги премести. Възможно е да се наложи ръчното им преместване или изтриването на старите файлове, а игрите да бъдат свалени отново. Продължаване въпреки това?" +"SteamBootstrapper_OK" "Добре" +"SteamBootstrapper_Cancel" "Отказ" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% — Фатална грешка" +"SteamBootstrapper_Warning_Title" "%appname% — Предупреждение" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% вече не се поддържа за версията на операционната Ви система." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_czech.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_czech.txt index 23af3033..c31e1143 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_czech.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_czech.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Klient služby %appname% je na tomto počítači již spuštěn pod jiným uživatelským účtem." "SteamBootstrapper_MoveContentDir_DestExists" "Klient služby %appname% změnil místo pro ukládání obsahu her z „~/Documents/Steam Content“ na „~/Library/Application Support/Steam/SteamApps“. Vaše herní soubory jsou uloženy na původním místě a klient služby %appname% nemohl soubory přesunout, protože již existují na novém místě. Možná bude nutné, abyste soubory přesunuli ručně nebo abyste staré soubory vymazali a hry si znovu stáhli. Chcete i přesto pokračovat?" "SteamBootstrapper_MoveContentDir_CopyError" "Klient služby %appname% změnil místo pro ukládání obsahu her z „~/Documents/Steam Content“ na „~/Library/Application Support/Steam/SteamApps“. Vaše herní soubory jsou uloženy na původním místě a klient služby %appname% nemohl soubory přesunout. Možná bude nutné, abyste soubory přesunuli ručně nebo abyste staré soubory vymazali a hry si znovu stáhli. Chcete i přesto pokračovat?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Zrušit" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% – Fatální chyba" -"SteamBootstrapper_Warning_Title" "%appname% – Varování" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Zrušit" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% – Fatální chyba" +"SteamBootstrapper_Warning_Title" "%appname% – Varování" "SteamBootstrapper_OperatingSystemNoLongerSupported" "Klient služby %appname% není podporován Vaším operačním systémem." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_danish.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_danish.txt index d04323ff..e2f0a3e8 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_danish.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_danish.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Der kører allerede en forekomst af %appname% på denne maskine med en anden brugerkonto." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% har ændret den placering, hvor der gemmes spilindhold, fra \"~/Documents/Steam Content\" til \"~/Library/Application Support/Steam/SteamApps\". Du har spilfiler liggende på den oprindelige placering, og %appname% kunne ikke flytte filerne, da der allerede findes filer på den nye placering. Du kan blive nødt til at flytte filerne manuelt eller slette de gamle filer og downloade dine spil igen. Fortsæt alligevel?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% har ændret den placering, hvor der gemmes spilindhold, fra \"~/Documents/Steam Content\" til \"~/Library/Application Support/Steam/SteamApps\". Du har spilfiler liggende på den oprindelige placering, og %appname% kunne ikke flytte filerne. Du kan blive nødt til at flytte filerne manuelt eller slette de gamle filer og downloade dine spil igen. Fortsæt alligevel?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Annuller" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Fatal fejl" -"SteamBootstrapper_Warning_Title" "%appname% - Advarsel" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Annuller" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Fatal fejl" +"SteamBootstrapper_Warning_Title" "%appname% - Advarsel" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% understøttes ikke længere i den nuværende version af dit operativsystem." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_dutch.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_dutch.txt index 52b2d7db..15eff4b6 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_dutch.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_dutch.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "%appname% is al actief op deze computer onder een ander gebruikersaccount." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% heeft de locatie waar spelcontent wordt opgeslagen gewijzigd van '~/Documents/Steam Content' in '~/Library/Application Support/Steam/SteamApps'. Er zitten spelbestanden op de oude locatie die %appname% niet kan verplaatsen omdat er zich al bestanden op de nieuwe locatie bevinden. Mogelijk moet je de bestanden handmatig verplaatsen of de oude bestanden verwijderen en je spellen opnieuw downloaden. Toch doorgaan?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% heeft de locatie waar spelcontent wordt opgeslagen gewijzigd van '~/Documents/Steam Content' in '~/Library/Application Support/Steam/SteamApps'. Er zitten spelbestanden op de oude locatie die %appname% niet kan verplaatsen. Mogelijk moet je de bestanden handmatig verplaatsen of de oude bestanden verwijderen en je spellen opnieuw downloaden. Toch doorgaan?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Annuleren" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Fatale fout" -"SteamBootstrapper_Warning_Title" "%appname% - Waarschuwing" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Annuleren" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Fatale fout" +"SteamBootstrapper_Warning_Title" "%appname% - Waarschuwing" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% wordt niet meer door de versie van je besturingssysteem ondersteund." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_english.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_english.txt index e1957f95..7c543342 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_english.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_english.txt @@ -31,6 +31,7 @@ SteamBootstrapper_DownloadComplete "Download complete." SteamBootstrapper_PercentComplete "%percent%%% complete" SteamBootstrapper_NoNetwork "%appname% needs to be online to update. Please confirm your network connection and try again." SteamBootstrapper_FailedMkdir "Couldn't create directory %dirname%, got error %errno%" +SteamBootstrapper_NotWriteable "Directory %dirname% not writable." SteamBootstrapper_FailedDownloadHTTPError "Download failed: http error %errno%" SteamBootstrapper_AlreadyRunningError "An instance of %appname% is already running on this computer, under a different user account." SteamBootstrapper_MoveContentDir_DestExists "%appname% has changed where it stores game content from '~/Documents/Steam Content' to '~/Library/Application Support/Steam/SteamApps'. You have game files in the original location, and Steam was not able to move the files because files already exist at the new location. You may need to move the files manually, or delete the old files and download your games again. Continue anyway?" diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_finnish.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_finnish.txt index 24ca4a14..9ecda574 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_finnish.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_finnish.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "%appname% on jo käynnissä tällä koneella eri käyttäjätilillä." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% on aiemmin tallentanut pelisisältöä hakemistoon '~/Documents/Steam Content', mutta nykyinen tallennushakemisto on '~/Library/Application Support/Steam/SteamApps'. Alkuperäisessä hakemistossa on pelitiedostoja, joita %appname% ei pystynyt siirtämään, koska uudessa hakemistossa on jo tiedostoja. Voit joutua siirtämään tiedostot manuaalisesti tai poistamaan vanhat tiedostot ja lataamaan pelisi uudelleen. Jatketaanko silti?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% on aiemmin tallentanut pelisisältöä hakemistoon '~/Documents/Steam Content', mutta nykyinen tallennushakemisto on '~/Library/Application Support/Steam/SteamApps'. Alkuperäisessä hakemistossa on pelitiedostoja, joita %appname% ei pystynyt siirtämään. Voit joutua siirtämään tiedostot manuaalisesti tai poistamaan vanhat tiedostot ja lataamaan pelisi uudelleen. Jatketaanko silti?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Peruuta" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Vakava virhe" -"SteamBootstrapper_Warning_Title" "%appname% - Varoitus" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Peruuta" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Vakava virhe" +"SteamBootstrapper_Warning_Title" "%appname% - Varoitus" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% ei ole enää tuettu käyttöjärjestelmäversiossasi." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_french.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_french.txt index 366fa7b8..98970acd 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_french.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_french.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "%appname% est déjà en cours d'exécution sur cet ordinateur sous un compte d'utilisateur différent." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% a changé l'emplacement où le contenu de jeu est stocké de '~/Documents/Steam Content' à '~/Library/Application Support/Steam/SteamApps'. L'emplacement d'origine contient toujours des fichiers de jeu que %appname% n'a pas pu déplacer car ils existent déjà dans le nouvel emplacement. Il se peut que vous deviez déplacer les fichiers manuellement, ou supprimer les anciens fichiers et télécharger de nouveau vos jeux. Continuer ?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% a changé l'emplacement où le contenu de jeu est stocké de '~/Documents/Steam Content' à '~/Library/Application Support/Steam/SteamApps'. L'emplacement d'origine contient toujours des fichiers de jeu que %appname% n'a pas pu déplacer. Il se peut que vous deviez déplacer les fichiers manuellement, ou supprimer les anciens fichiers et télécharger de nouveau vos jeux. Continuer ?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Annuler" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Erreur fatale" -"SteamBootstrapper_Warning_Title" "%appname% - Avertissement" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Annuler" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Erreur fatale" +"SteamBootstrapper_Warning_Title" "%appname% - Avertissement" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% n'est plus pris en charge par la version de votre système d'exploitation." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_german.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_german.txt index 689d7531..78d65001 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_german.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_german.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "%appname% wird auf diesem Gerät bereits unter einem anderen Benutzerkonto ausgeführt." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% speichert Spielinhalte nicht mehr unter '~/Documents/Steam Content' sondern unter '~/Library/Application Support/Steam/SteamApps'. Es befinden sich noch Spieledateien im alten Speicherort, die von %appname% nicht verschoben werden konnten, da bereits Dateien im neuen Speicherort vorhanden sind. Sie müssen die Dateien daher ggf. manuell verschieben oder die alten Dateien löschen und die Spiele erneut herunterladen. Trotzdem fortfahren?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% speichert Spielinhalte nicht mehr unter '~/Documents/Steam Content' sondern unter '~/Library/Application Support/Steam/SteamApps'. Es liegen noch Spieledateien im alten Speicherort, die von %appname% nicht verschoben werden konnten. Sie müssen die Dateien daher ggf. manuell verschieben oder die alten Dateien löschen und die Spiele erneut herunterladen. Trotzdem fortfahren?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Abbrechen" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Kritischer Fehler" -"SteamBootstrapper_Warning_Title" "%appname% - Warnung" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Abbrechen" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Kritischer Fehler" +"SteamBootstrapper_Warning_Title" "%appname% - Warnung" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% wird von Ihrer Betriebssystemversion nicht mehr unterstützt." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_greek.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_greek.txt index 073158f2..369fe2cd 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_greek.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_greek.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Η εφαρμογή %appname% ήδη εκτελείται σε αυτό τον υπολογιστή, υπό διαφορετικό όνομα χρήστη." "SteamBootstrapper_MoveContentDir_DestExists" "Το %appname% άλλαξε φάκελο αποθήκευσης παιχνιδιών από '~/Documents/Steam Content' σε '~/Library/Application Support/Steam/SteamApps'. Έχετε αρχεία παιχνιδιών στον αρχικό φάκελο και το %appname% δεν μπόρεσε να μετακινήσει τα αρχεία επειδή τα αρχεία υπάρχουν ήδη στη νέα τοποθεσία. Μπορεί να χρειαστεί να μετακινήσετε τα αρχεία εσείς, ή να διαγράψετε τα παλιά αρχεία και να κατεβάσετε τα αρχεία ξανά. Συνέχεια;" "SteamBootstrapper_MoveContentDir_CopyError" "Το %appname% άλλαξε φάκελο αποθήκευσης παιχνιδιών από '~/Documents/Steam Content' σε '~/Library/Application Support/Steam/SteamApps'. Έχετε αρχεία παιχνιδιών στον αρχικό φάκελο και το %appname% δεν μπόρεσε να μετακινήσει τα αρχεία. Μπορεί να χρειαστεί να μετακινήσετε τα αρχεία εσείς, ή να διαγράψετε τα παλιά αρχεία και να κατεβάσετε τα αρχεία ξανά. Συνέχεια;" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Άκυρο" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Aνεπανόρθωτο σφάλμα" -"SteamBootstrapper_Warning_Title" "%appname% - Προειδοποίηση" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Άκυρο" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Aνεπανόρθωτο σφάλμα" +"SteamBootstrapper_Warning_Title" "%appname% - Προειδοποίηση" "SteamBootstrapper_OperatingSystemNoLongerSupported" "Το %appname% δεν υποστηρίζεται πλέον στην έκδοση του λειτουργικού σας συστήματος." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_hungarian.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_hungarian.txt index d7cfdb2a..19736535 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_hungarian.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_hungarian.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "A(z) %appname% egy példánya már fut ezen a számítógépen, egy másik felhasználói fiók alatt." "SteamBootstrapper_MoveContentDir_DestExists" "A(z) %appname% módosította a játéktartalmak mentési útvonalát a „~/Documents/Steam Content” helyről a „~/Library/Application Support/Steam/SteamApps” helyre. Játékfájlok vannak az eredeti helyen, és a(z) %appname% nem tudta áthelyezni a fájlokat, mert már léteznek fájlok az új helyen. Előfordulhat, hogy manuálisan kell áthelyezned a fájlokat, vagy törölnöd kell a régi fájlokat, és újra le kell töltened a játékaidat. Ennek ellenére folytatod?" "SteamBootstrapper_MoveContentDir_CopyError" "A(z) %appname% módosította a játéktartalmak mentési útvonalát a „~/Documents/Steam Content” helyről a „~/Library/Application Support/Steam/SteamApps” helyre. Játékfájlok vannak az eredeti helyen, és a(z) %appname% nem tudta áthelyezni a fájlokat. Előfordulhat, hogy manuálisan kell áthelyezned a fájlokat, vagy törölnöd kell a régi fájlokat, és újra le kell töltened a játékaidat. Ennek ellenére folytatod?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Mégse" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Végzetes hiba" -"SteamBootstrapper_Warning_Title" "%appname% - Figyelmeztetés" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Mégse" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Végzetes hiba" +"SteamBootstrapper_Warning_Title" "%appname% - Figyelmeztetés" "SteamBootstrapper_OperatingSystemNoLongerSupported" "A(z) %appname% már nem támogatott operációs rendszered verzióján." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_italian.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_italian.txt index 6e45f4fb..e7d4870d 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_italian.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_italian.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Una richiesta di %appname% è già in esecuzione su questo computer con un account utente diverso." "SteamBootstrapper_MoveContentDir_DestExists" "È stato modificato il percorso in cui %appname% memorizza i contenuti di gioco da '~/Documents/Steam Content' in '~/Library/Application Support/Steam/SteamApps'. Sono presenti file di gioco nel percorso originario e %appname% non è stato in grado di spostarli poiché ne esistono già nel nuovo percorso. Potrebbe essere necessario spostare i file manualmente o cancellare i vecchi file e scaricare nuovamente i giochi. Continuare?" "SteamBootstrapper_MoveContentDir_CopyError" "È stato modificato il percorso in cui %appname% memorizza i contenuti di gioco da '~/Documents/Steam Content' in '~/Library/Application Support/Steam/SteamApps'. Sono presenti file di gioco nel percorso originario e %appname% non è stato in grado di spostarli. Potrebbe essere necessario spostare i file manualmente o cancellare i vecchi file e scaricare nuovamente i giochi. Continuare?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Annulla" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Errore fatale" -"SteamBootstrapper_Warning_Title" "%appname% - Attenzione" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Annulla" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Errore fatale" +"SteamBootstrapper_Warning_Title" "%appname% - Attenzione" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% non è più compatibile con la versione del tuo sistema operativo." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_japanese.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_japanese.txt index 59daaa78..23fd1725 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_japanese.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_japanese.txt @@ -4,10 +4,10 @@ "SteamBootstrapper_UpdatingSteam" "%appname% を更新中..." "SteamBootstrapper_ElevationPrompt" "%appname% を起動するには、まず更新する必要があります。" "SteamBootstrapper_ReadOnlyInstallOSX" "インストール ディレクトリに書き込むことができません。ディスク イメージから起動していないかご確認ください。" -"SteamBootstrapper_RunFromDiskImageOSX" "起動する前に %appname% をアプリケーションフォルダにドラッグしてください。" +"SteamBootstrapper_RunFromDiskImageOSX" "起動する前に%appname%をアプリケーションフォルダにドラッグしてください。" "SteamBootstrapper_ReadOnlyInstall" "インストール ディレクトリに書き込めません。" -"SteamBootstrapper_InstallDirNotASCII" "%appname% は英語以外の文字が含まれるフォルダパス名から実行することはできません。 %appname% を標準のフォルダに再インストールしてください。" -"SteamBootstrapper_InstallDirIncompatible" "%appname% は、このバージョンの Windows 上では ASCII 以外の文字が含まれるフォルダパス名から実行することはできません。 %appname% を標準のフォルダに再インストールするか、Windows 7 以降にインストールしてください。" +"SteamBootstrapper_InstallDirNotASCII" "%appname%は英語以外の文字が含まれるフォルダーパス名から実行することはできません。 %appname%を標準のフォルダーに再インストールしてください。" +"SteamBootstrapper_InstallDirIncompatible" "%appname%は、このバージョンのWindows上ではASCII以外の文字が含まれるフォルダーパス名から実行することはできません。 %appname%を標準のフォルダーに再インストールするか、Windows 7以降にインストールしてください。" "SteamBootstrapper_InsufficientDiskSpace" "%appname% の更新には、ディスク領域に%nMegaBytes%MB の空き容量が必要です。" "SteamBootstrapper_FailedManifestLoad" "パッケージ リストを読み込めませんでした。" "SteamBootstrapper_FailedManifestVerify" "パッケージ リストを検証できませんでした。" @@ -32,13 +32,13 @@ "SteamBootstrapper_NoNetwork" "%appname% の更新にはインターネットにアクセスする必要があります。ネットワーク接続をご確認のうえ、もう一度お試しください。" "SteamBootstrapper_FailedMkdir" "ディレクトリ \"%dirname%\" を作成できませんでした。エラー %errno%" "SteamBootstrapper_FailedDownloadHTTPError" "ダウンロードできませんでした：http エラー %errno%" -"SteamBootstrapper_AlreadyRunningError" "このコンピュータでは、既に %appname% が別のユーザーアカウントで実行されています。" +"SteamBootstrapper_AlreadyRunningError" "このコンピューターでは、すでに%appname%が別のユーザーアカウントで実行されています。" "SteamBootstrapper_MoveContentDir_DestExists" "%appname% のゲームコンテンツ保管場所が '~/Documents/Steam Content' から '~/Library/Application Support/Steam/SteamApps' に変更されました。変更前の場所にゲームファイルがあるため自動で新しい場所に移動しようとしましたが、すでに新しい場所にファイルがあるために移動できませんでした。手動でファイルを移動するか、古いファイルを削除してゲームをダウンロードしなおす必要がある可能性があります。このまま続けますか？" "SteamBootstrapper_MoveContentDir_CopyError" "%appname%のゲームコンテンツ保管場所が '~/Documents/Steam Content' から '~/Library/Application Support/Steam/SteamApps' に変更されました。変更前の場所にゲームファイルがあるため自動で新しい場所に移動しようとしましたが、できませんでした。手動でファイルを移動するか、古いファイルを削除してゲームをダウンロードしなおす必要がある可能性があります。このまま続けますか？" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "キャンセル" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - 致命的なエラー" -"SteamBootstrapper_Warning_Title" "%appname% - 警告" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "キャンセル" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - 致命的なエラー" +"SteamBootstrapper_Warning_Title" "%appname% - 警告" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% はお使いのオペレーティングシステムのバージョンではもうサポートされていません。" } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_korean.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_korean.txt index 1d417a9b..f751379d 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_korean.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_korean.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "이 컴퓨터에서 %appname%이(가) 이미 다른 사용자 계정으로 실행 중입니다." "SteamBootstrapper_MoveContentDir_DestExists" "%appname%의 게임 콘텐츠 저장 위치가 '~/Documents/Steam Content'에서 '~/Library/Application Support/Steam/SteamApps'로 변경되었습니다. 새로운 위치에 이미 파일이 존재하기 때문에 원래 위치의 게임 파일을 이동하지 못했습니다. 원래 위치의 파일을 직접 옮기거나 오래된 파일을 지우고 게임을 다시 다운로드할 수 있습니다. 계속 실행하시겠습니까?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname%의 게임 콘텐츠 저장 위치가 '~/Documents/Steam Content'에서 '~/Library/Application Support/Steam/SteamApps'로 변경되었습니다. 원래 위치의 게임 파일은 이동하지 못했습니다. 원래 위치의 파일을 직접 옮기거나 오래된 파일을 지우고 게임을 다시 다운로드할 수 있습니다. 계속 실행하시겠습니까?" -"SteamBootstrapper_OK" "확인" -"SteamBootstrapper_Cancel" "취소" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - 치명적인 오류" -"SteamBootstrapper_Warning_Title" "%appname% - 경고" +"SteamBootstrapper_OK" "확인" +"SteamBootstrapper_Cancel" "취소" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - 치명적인 오류" +"SteamBootstrapper_Warning_Title" "%appname% - 경고" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% 앱은 현재 사용 중인 운영 체제 버전에서 더 이상 지원되지 않습니다." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_koreana.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_koreana.txt index 1d417a9b..f751379d 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_koreana.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_koreana.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "이 컴퓨터에서 %appname%이(가) 이미 다른 사용자 계정으로 실행 중입니다." "SteamBootstrapper_MoveContentDir_DestExists" "%appname%의 게임 콘텐츠 저장 위치가 '~/Documents/Steam Content'에서 '~/Library/Application Support/Steam/SteamApps'로 변경되었습니다. 새로운 위치에 이미 파일이 존재하기 때문에 원래 위치의 게임 파일을 이동하지 못했습니다. 원래 위치의 파일을 직접 옮기거나 오래된 파일을 지우고 게임을 다시 다운로드할 수 있습니다. 계속 실행하시겠습니까?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname%의 게임 콘텐츠 저장 위치가 '~/Documents/Steam Content'에서 '~/Library/Application Support/Steam/SteamApps'로 변경되었습니다. 원래 위치의 게임 파일은 이동하지 못했습니다. 원래 위치의 파일을 직접 옮기거나 오래된 파일을 지우고 게임을 다시 다운로드할 수 있습니다. 계속 실행하시겠습니까?" -"SteamBootstrapper_OK" "확인" -"SteamBootstrapper_Cancel" "취소" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - 치명적인 오류" -"SteamBootstrapper_Warning_Title" "%appname% - 경고" +"SteamBootstrapper_OK" "확인" +"SteamBootstrapper_Cancel" "취소" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - 치명적인 오류" +"SteamBootstrapper_Warning_Title" "%appname% - 경고" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% 앱은 현재 사용 중인 운영 체제 버전에서 더 이상 지원되지 않습니다." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_latam.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_latam.txt index 6365743a..b7a0cced 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_latam.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_latam.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Ya se está ejecutando %appname% en este equipo con otra cuenta de usuario." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% ha cambiado el lugar en el que almacena el contenido de los juegos de '~/Documents/Steam Content' a '~/Library/Application Support/Steam/SteamApps'. Tienes archivos de juegos en la ubicación original y %appname% no ha podido moverlos porque ya existen en la nueva ubicación. Puede que tengas que moverlos manualmente o eliminar los antiguos y volver a descargar los juegos. ¿Quieres continuar de todos modos?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% ha cambiado el lugar en el que almacena el contenido de los juegos de '~/Documents/Steam Content' a '~/Library/Application Support/Steam/SteamApps'. Tienes archivos de juegos en la ubicación original y %appname% no ha podido moverlos. Puede que tengas que moverlos manualmente o eliminar los antiguos y volver a descargar los juegos. ¿Quieres continuar de todos modos?" -"SteamBootstrapper_OK" "Aceptar" -"SteamBootstrapper_Cancel" "Cancelar" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Error fatal" -"SteamBootstrapper_Warning_Title" "%appname% - Advertencia" +"SteamBootstrapper_OK" "Aceptar" +"SteamBootstrapper_Cancel" "Cancelar" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Error fatal" +"SteamBootstrapper_Warning_Title" "%appname% - Advertencia" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% ya no es compatible con la versión de tu sistema operativo." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_norwegian.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_norwegian.txt index 298f29f3..03e7d352 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_norwegian.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_norwegian.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Det kjører allerede en forekomst av %appname% på denne datamaskinen med en annen brukerkonto." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% har endret lagringssted for spillinnhold fra ~/Documents/Steam Content til ~/Library/Application Support/Steam/SteamApps. Du har spillfiler på det opprinnelige lagringsstedet, og %appname% kunne ikke flytte filene fordi det allerede finnes filer på det nye lagringsstedet. Det kan hende at du må flytte filene manuelt eller slette de gamle filene og laste ned spillene på nytt. Vil du fortsette likevel?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% har endret lagringssted for spillinnhold fra '~/Documents/Steam Content' til '~/Library/Application Support/Steam/SteamApps'. Du har spillfiler på det opprinnelige lagringsstedet, og %appname% kunne ikke flytte filene. Det kan hende at du må flytte filene manuelt eller slette de gamle filene og laste ned spillene på nytt. Vil du fortsette likevel?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Avbryt" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Fatal feil" -"SteamBootstrapper_Warning_Title" "%appname% - Advarsel" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Avbryt" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Fatal feil" +"SteamBootstrapper_Warning_Title" "%appname% - Advarsel" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% støttes ikke lenger på gjeldende versjon av operativsystemet." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_polish.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_polish.txt index 2c570326..672cd589 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_polish.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_polish.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Aplikacja %appname% została już uruchomiona na tym komputerze z wykorzystaniem innego konta użytkownika." "SteamBootstrapper_MoveContentDir_DestExists" "Aplikacja %appname% zmieniła miejsce zapisu zawartości gier z „~/Documents/Steam Content” na „~/Library/Application Support/Steam/SteamApps”. W pierwotnej lokalizacji znajdują się pliki gier, których aplikacja %appname% nie mogła przenieść, ponieważ istnieją już w nowej lokalizacji. Może być konieczne przeniesienie plików ręcznie lub usunięcie starych plików i ponowne pobranie gier. Czy mimo to kontynuować?" "SteamBootstrapper_MoveContentDir_CopyError" "Aplikacja %appname% zmieniła miejsce zapisu zawartości gier z „~/Documents/Steam Content” na „~/Library/Application Support/Steam/SteamApps”. W pierwotnej lokalizacji znajdują się pliki gier, których aplikacja %appname% nie mogła przenieść. Może być konieczne przeniesienie plików ręcznie lub usunięcie starych plików i ponowne pobranie gier. Czy mimo to kontynuować?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Anuluj" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - błąd krytyczny" -"SteamBootstrapper_Warning_Title" "%appname% - ostrzeżenie" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Anuluj" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - błąd krytyczny" +"SteamBootstrapper_Warning_Title" "%appname% - ostrzeżenie" "SteamBootstrapper_OperatingSystemNoLongerSupported" "Aplikacja %appname% nie jest już wspierana na twojej wersji systemu operacyjnego." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_portuguese.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_portuguese.txt index 474cc938..9967886b 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_portuguese.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_portuguese.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Uma instância de %appname% já está a ser executada neste computador, numa conta de utilizador diferente." "SteamBootstrapper_MoveContentDir_DestExists" "O %appname% mudou o local onde guarda os ficheiros de '~/Documents/%appname% Content' para '~/Library/Application Support/%appname%/%appname%Apps'. Existem ficheiros na localização original e o %appname% não conseguiu mover os ficheiros porque estes já existem na nova localização. Talvez seja necessário mover os ficheiros manualmente ou eliminar os ficheiros e transferir os jogos novamente. Continuar?" "SteamBootstrapper_MoveContentDir_CopyError" "O %appname% mudou o local onde guarda os ficheiros de '~/Documents/%appname% Content' para '~/Library/Application Support/%appname%/%appname%Apps'. Existem ficheiros na localização original e o %appname% não conseguiu mover os ficheiros. Talvez seja necessário mover os ficheiros manualmente ou eliminar os ficheiros e transferir os jogos novamente. Continuar?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Cancelar" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Erro Crítico" -"SteamBootstrapper_Warning_Title" "%appname% - Aviso" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Cancelar" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Erro Crítico" +"SteamBootstrapper_Warning_Title" "%appname% - Aviso" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% já não é suportado na versão atual do teu sistema operativo." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_romanian.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_romanian.txt index 2c60b08b..29eba013 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_romanian.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_romanian.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "O instanță de %appname% rulează deja pe acest calculator, sub un alt cont de utilizator." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% a schimbat locul de stocare a conţinutului aferent jocurilor de la '~/Documents/Steam Content' la '~/Library/Application Support/Steam/SteamApps'. Aveţi fişiere de jocuri în locul original şi %appname% nu a putut să le mute deoarece fişierele există deja în locul nou. Poate fi necesar să mutaţi fişierele manual sau să ştergeţi fişierele vechi şi să descărcaţi din nou jocurile. Continuaţi oricum?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% a schimbat locul de stocare a conţinutului aferent jocurilor de la '~/Documents/Steam Content' la '~/Library/Application Support/Steam/SteamApps'. Aveţi fişiere de jocuri în locul original şi %appname% nu a putut să le mute. Poate fi necesar să mutaţi fişierele manual sau să ştergeţi fişierele vechi şi să descărcaţi din nou jocurile. Continuaţi oricum?" -"SteamBootstrapper_OK" "Ok" -"SteamBootstrapper_Cancel" "Anulează" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Eroare fatală" -"SteamBootstrapper_Warning_Title" "%appname% - Atenţie" +"SteamBootstrapper_OK" "Ok" +"SteamBootstrapper_Cancel" "Anulează" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Eroare fatală" +"SteamBootstrapper_Warning_Title" "%appname% - Atenţie" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% nu mai este compatibil cu versiunea sistemului tău de operare." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_russian.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_russian.txt index 062a0f30..f7eb99e0 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_russian.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_russian.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Приложение %appname% уже запущено на этом компьютере с другой учётной записи." "SteamBootstrapper_MoveContentDir_DestExists" "Папка для хранения контента игры %appname% была изменена с '~/Documents/Steam Content' на '~/Library/Application Support/Steam/SteamApps'. Файлы игры находятся в первоначальной папке и %appname% не смог перенести их, так как такие же файлы уже существуют в новой папке. Возможно, вам придется перенести эти файлы вручную или удалить старые файлы и загрузить ваши игры еще раз. Продолжить?" "SteamBootstrapper_MoveContentDir_CopyError" "Папка для хранения контента игры %appname% была изменена с '~/Documents/Steam Content' на '~/Library/Application Support/Steam/SteamApps'. Файлы игры находятся в первоначальной папке и %appname% не смог перенести их. Возможно, вам придется перенести эти файлы вручную или удалить старые файлы и загрузить ваши игры еще раз. Продолжить?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Отмена" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% — критическая ошибка" -"SteamBootstrapper_Warning_Title" "%appname% — предупреждение" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Отмена" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% — критическая ошибка" +"SteamBootstrapper_Warning_Title" "%appname% — предупреждение" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% больше не поддерживается в вашей версии операционной системы." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_schinese.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_schinese.txt index 771678df..e2cf917a 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_schinese.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_schinese.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "一个 %appname% 的实例已在此计算机上以其他用户帐户运行。" "SteamBootstrapper_MoveContentDir_DestExists" "%appname% 已经将游戏内容保存位置由“~/Documents/Steam Content”更改为“~/Library/Application Support/Steam/SteamApps”。在原始位置保存的游戏文件，Steam 无法移动，因为新的保存位置上已经有文件存在。您可能需要手动移动这些文件，或者删除旧文件然后重新下载游戏。是否继续？" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% 已经将游戏内容保存位置由“~/Documents/Steam Content”更改为“~/Library/Application Support/Steam/SteamApps”。在原始位置保存的游戏文件，Steam 无法移动。您可能需要手动移动这些文件，或者删除旧文件然后重新下载游戏。是否继续？" -"SteamBootstrapper_OK" "确定" -"SteamBootstrapper_Cancel" "取消" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - 致命错误" -"SteamBootstrapper_Warning_Title" "%appname% - 警告" +"SteamBootstrapper_OK" "确定" +"SteamBootstrapper_Cancel" "取消" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - 致命错误" +"SteamBootstrapper_Warning_Title" "%appname% - 警告" "SteamBootstrapper_OperatingSystemNoLongerSupported" "您当前的操作系统版本不再支持 %appname%。" } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_spanish.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_spanish.txt index 30caad58..acf16965 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_spanish.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_spanish.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Ya se está ejecutando %appname% en este equipo con otra cuenta de usuario." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% ha cambiado el lugar en el que almacena el contenido de los juegos de '~/Documents/Steam Content' a '~/Library/Application Support/Steam/SteamApps'. Tienes archivos de juegos en la ubicación original y %appname% no ha podido moverlos porque ya existen en la nueva ubicación. Puede que tengas que moverlos manualmente o eliminar los antiguos y volver a descargar los juegos. ¿Quieres continuar de todos modos?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% ha cambiado el lugar en el que almacena el contenido de los juegos de '~/Documents/Steam Content' a '~/Library/Application Support/Steam/SteamApps'. Tienes archivos de juegos en la ubicación original y %appname% no ha podido moverlos. Puede que tengas que moverlos manualmente o eliminar los antiguos y volver a descargar los juegos. ¿Quieres continuar de todos modos?" -"SteamBootstrapper_OK" "Aceptar" -"SteamBootstrapper_Cancel" "Cancelar" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Error fatal" -"SteamBootstrapper_Warning_Title" "%appname% - Advertencia" +"SteamBootstrapper_OK" "Aceptar" +"SteamBootstrapper_Cancel" "Cancelar" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Error fatal" +"SteamBootstrapper_Warning_Title" "%appname% - Advertencia" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% ya no es compatible con la versión de tu sistema operativo." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_swedish.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_swedish.txt index 1dbce7d5..04fd62d5 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_swedish.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_swedish.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Det körs redan en förekomst av %appname% på den här datorn under ett annat användarkonto." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% har ändrat platsen där spelinnehåll lagras, från \"~/Documents/Steam Content\" till \"~/Library/Application Support/Steam/SteamApps\". Du har spelfiler på den ursprungliga platsen, men %appname% kunde inte flytta filerna eftersom filerna redan finns på den nya platsen. Du kan behöva flytta filerna manuellt eller radera de gamla filerna och hämta spelen igen. Fortsätt ändå?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% har ändrat platsen där spelinnehåll lagras, från \"~/Documents/Steam Content\" till \"~/Library/Application Support/Steam/SteamApps\". Du har spelfiler på den ursprungliga platsen, men %appname% kunde inte flytta filerna. Du kan behöva flytta filerna manuellt eller radera de gamla filerna och hämta spelen igen. Fortsätt ändå?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Avbryt" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Allvarligt fel" -"SteamBootstrapper_Warning_Title" "%appname% - Varning" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Avbryt" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Allvarligt fel" +"SteamBootstrapper_Warning_Title" "%appname% - Varning" "SteamBootstrapper_OperatingSystemNoLongerSupported" "Versionen av ditt operativsystem stöder inte längre %appname%." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_tchinese.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_tchinese.txt index f8251272..e7923519 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_tchinese.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_tchinese.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "這台電腦已正在執行 %appname%，是由另一個使用者帳戶所使用。" "SteamBootstrapper_MoveContentDir_DestExists" "%appname% 已將儲存遊戲內容的位置從「~/Documents/Steam Content」變更為「~/Library/Application Support/Steam/SteamApps」。原始位置中仍有您的遊戲檔案，但 %appname% 無法移動檔案，因為新位置中已存在檔案。您必須手動移動檔案，或刪除舊檔案然後重新下載遊戲。是否仍要繼續？" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% 已將儲存遊戲內容的位置從「~/Documents/Steam Content」變更為「~/Library/Application Support/Steam/SteamApps」。原始位置中仍有您的遊戲檔案，但 %appname% 無法移動檔案。您必須手動移動檔案，或刪除舊檔案然後重新下載遊戲。是否仍要繼續？" -"SteamBootstrapper_OK" "確定" -"SteamBootstrapper_Cancel" "取消" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - 重大錯誤" -"SteamBootstrapper_Warning_Title" "%appname% - 警告" +"SteamBootstrapper_OK" "確定" +"SteamBootstrapper_Cancel" "取消" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - 重大錯誤" +"SteamBootstrapper_Warning_Title" "%appname% - 警告" "SteamBootstrapper_OperatingSystemNoLongerSupported" "您目前的作業系統版本已無法支援 %appname%。" } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_thai.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_thai.txt index 8cf8cc41..7cfc2bb7 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_thai.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_thai.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "โปรแกรม %appname% กำลังเปิดบนคอมพิวเตอร์นี้อยู่แล้วโดยใช้บัญชีผู้ใช้อื่น" "SteamBootstrapper_MoveContentDir_DestExists" "%appname% เปลี่ยนที่เก็บข้อมูลเกมจาก '~/Documents/Steam Content' เป็น '~/Library/Application Support/Steam/SteamApps' คุณมีไฟล์เกมอยู่ในตำแหน่งเดิม และ %appname% ไม่สามารถย้ายไฟล์ได้เนื่องจากไฟล์มีอยู่แล้วในตำแหน่งใหม่ คุณอาจต้องการย้ายไฟล์ด้วยตนเอง หรือลบไฟล์เก่า และดาวน์โหลดเกมของคุณอีกครั้ง ดำเนินการต่อไปหรือไม่" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% เปลี่ยนที่เก็บข้อมูลเกมจาก '~/Documents/Steam Content' เป็น '~/Library/Application Support/Steam/SteamApps' คุณมีไฟล์เกมอยู่ในตำแหน่งเดิม และ %appname% ไม่สามารถย้ายไฟล์ได้ คุณอาจต้องการย้ายไฟล์ด้วยตนเอง หรือลบไฟล์เก่า และดาวน์โหลดเกมของคุณอีกครั้ง ดำเนินการต่อไปหรือไม่" -"SteamBootstrapper_OK" "ตกลง" -"SteamBootstrapper_Cancel" "ยกเลิก" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - ข้อผิดพลาดร้ายแรง" -"SteamBootstrapper_Warning_Title" "%appname% - คำเตือน" +"SteamBootstrapper_OK" "ตกลง" +"SteamBootstrapper_Cancel" "ยกเลิก" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - ข้อผิดพลาดร้ายแรง" +"SteamBootstrapper_Warning_Title" "%appname% - คำเตือน" "SteamBootstrapper_OperatingSystemNoLongerSupported" "เวอร์ชันระบบปฏิบัติการของคุณไม่รองรับ %appname% อีกต่อไป" } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_turkish.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_turkish.txt index 40efd375..4f89cd5c 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_turkish.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_turkish.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "%appname% uygulamasının bir örneği bu bilgisayarda zaten çalışmaktadır, başka bir hesap kullanarak deneyin." "SteamBootstrapper_MoveContentDir_DestExists" "%appname%, oyun içeriklerini depolama yerini '~/Documents/Steam Content' den '~/Library/Application Support/Steam/SteamApps' olarak değiştirdi. Orijinal depolama yerinde dosyalarınız var ve %appname% bu dosyaları taşıyamıyor çünkü dosyalar zaten yeni depolama yerinde oluşturulmuş. Bu dosyaları taşıma işlemini elle yapabilir ya da eski dosyaları silerek oyunlarınızı tekrar indirebilirsiniz. Devam edilsin mi?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname%, oyun içeriklerini depolama yerini '~/Documents/Steam Content' den '~/Library/Application Support/Steam/SteamApps' olarak değiştirdi. Orijinal depolama yerinde dosyalarınız var ve %appname% bu dosyaları taşıyamıyor. Bu dosyaları taşıma işlemini elle yapabilir ya da eski dosyaları silerek oyunlarınızı tekrar indirebilirsiniz. Devam edilsin mi?" -"SteamBootstrapper_OK" "Tamam" -"SteamBootstrapper_Cancel" "İptal" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Kritik Hata" -"SteamBootstrapper_Warning_Title" "%appname% - Uyarı" +"SteamBootstrapper_OK" "Tamam" +"SteamBootstrapper_Cancel" "İptal" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Kritik Hata" +"SteamBootstrapper_Warning_Title" "%appname% - Uyarı" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname%, artık mevcut işletim sistemi sürümünüzde desteklenmiyor." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_ukrainian.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_ukrainian.txt index 429d484c..57c14000 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_ukrainian.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_ukrainian.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "%appname% вже запущено на цьому комп’ютері під іншим акаунтом." "SteamBootstrapper_MoveContentDir_DestExists" "Розташування ігрових даних для %appname% було змінено з «~/Documents/%appname% Content» на «~/Library/Application Support/%appname%/%appname%Apps». Ви маєте файли в попередньому місці, але %appname% не вдалося їх перемістити, оскільки ці файли вже існують у новому розташуванні. Вам можливо доведеться перемістити файли самотужки, видалити старі файли або заново завантажити свої ігри. Усе одно продовжити?" "SteamBootstrapper_MoveContentDir_CopyError" "Розташування ігрових даних для %appname% було змінено з «~/Documents/%appname% Content» на «~/Library/Application Support/%appname%/%appname%Apps». Ви маєте файли в попередньому місці, але %appname% не вдалося їх перемістити. Вам можливо доведеться перемістити файли самотужки, видалити старі файли або заново завантажити свої ігри. Усе одно продовжити?" -"SteamBootstrapper_OK" "Гаразд" -"SteamBootstrapper_Cancel" "Скасувати" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% — Критична помилка" -"SteamBootstrapper_Warning_Title" "%appname% — Попередження" +"SteamBootstrapper_OK" "Гаразд" +"SteamBootstrapper_Cancel" "Скасувати" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% — Критична помилка" +"SteamBootstrapper_Warning_Title" "%appname% — Попередження" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% більше не підтримується вашою версією операційної системи." } diff --git a/desktop/content-builder/builder_osx/public/steambootstrapper_vietnamese.txt b/desktop/content-builder/builder_osx/public/steambootstrapper_vietnamese.txt index d054d595..f6490081 100755 --- a/desktop/content-builder/builder_osx/public/steambootstrapper_vietnamese.txt +++ b/desktop/content-builder/builder_osx/public/steambootstrapper_vietnamese.txt @@ -35,10 +35,10 @@ "SteamBootstrapper_AlreadyRunningError" "Một bản %appname% hiện đã chạy trên máy tính này, dưới tên người dùng khác." "SteamBootstrapper_MoveContentDir_DestExists" "%appname% đã thay đổi nơi nó chứa nội dung trò chơi từ '~/Documents/Steam Content' sang '~/Library/Application Support/Steam/SteamApps'. Bạn có tệp trò chơi ở vị trí đầu tiên, và %appname% đã không thể dời các tệp đi vì các tệp đã xuất hiện tại địa chỉ mới. Bạn có thể cần phải dời các tệp đó bằng tay, hoặc xóa các tệp cũ và tải lại trò chơi của mình một lần nữa. Cứ tiếp tục?" "SteamBootstrapper_MoveContentDir_CopyError" "%appname% đã thay đổi nơi nó chứa nội dung trò chơi từ '~/Documents/Steam Content' sang '~/Library/Application Support/Steam/SteamApps'. Bạn có tệp trò chơi ở vị trí đầu tiên, và %appname% đã không thể dời các tệp đi. Bạn có thể cần phải dời các tệp đó bằng tay, hoặc xóa các tệp cũ và tải lại trò chơi của mình một lần nữa. Cứ tiếp tục?" -"SteamBootstrapper_OK" "OK" -"SteamBootstrapper_Cancel" "Hủy" -"SteamBootstrapper_WindowTitle" "%appname%" -"SteamBootstrapper_Error_Title" "%appname% - Lỗi nghiêm trọng" -"SteamBootstrapper_Warning_Title" "%appname% - Cảnh báo" +"SteamBootstrapper_OK" "OK" +"SteamBootstrapper_Cancel" "Hủy" +"SteamBootstrapper_WindowTitle" "%appname%" +"SteamBootstrapper_Error_Title" "%appname% - Lỗi nghiêm trọng" +"SteamBootstrapper_Warning_Title" "%appname% - Cảnh báo" "SteamBootstrapper_OperatingSystemNoLongerSupported" "%appname% không còn được hỗ trợ trên phiên bản hệ điều hành của bạn." } diff --git a/desktop/content-builder/builder_osx/steamclient.dylib b/desktop/content-builder/builder_osx/steamclient.dylib index 47fd0b59..a44ce06c 100755 Binary files a/desktop/content-builder/builder_osx/steamclient.dylib and b/desktop/content-builder/builder_osx/steamclient.dylib differ diff --git a/desktop/content-builder/builder_osx/steamcmd b/desktop/content-builder/builder_osx/steamcmd index b0d25cfb..236aa11d 100755 Binary files a/desktop/content-builder/builder_osx/steamcmd and b/desktop/content-builder/builder_osx/steamcmd differ diff --git a/desktop/content-builder/builder_osx/steamconsole.dylib b/desktop/content-builder/builder_osx/steamconsole.dylib index 384eefff..d7cc276e 100755 Binary files a/desktop/content-builder/builder_osx/steamconsole.dylib and b/desktop/content-builder/builder_osx/steamconsole.dylib differ diff --git a/desktop/content-builder/builder_osx/update_hosts_cached.vdf b/desktop/content-builder/builder_osx/update_hosts_cached.vdf index 484e4f4f..84d69570 100755 --- a/desktop/content-builder/builder_osx/update_hosts_cached.vdf +++ b/desktop/content-builder/builder_osx/update_hosts_cached.vdf @@ -8,7 +8,13 @@ { "steamglobal" { - "steamcdn-a.akamaihd.net" + "cdn.akamai.steamstatic.com" + { + "base_url" "/client/" + "weight" "100" + "https" "1" + } + "cdn.cloudflare.steamstatic.com" { "base_url" "/client/" "weight" "100" @@ -17,7 +23,7 @@ "media.st.dl.pinyuncloud.com" { "base_url" "/client/" - "weight" "1000" + "weight" "10000" "country_codes" "CN" "https" "1" } @@ -36,12 +42,12 @@ } "kvsign2" { - "Hosts" "10de01f6c02b907028ab21d756018843e4615f71554a461ed4ae8f799c6a2a2829429b17410eea5332ec188c648a873b961ac41a3456687c8f9d4b87a840ff01" + "Hosts" "0da3ef8e55a58afb9fa5466255eb9017abcb3f4b0d7df33dc5a886d86584adbba4c23558df23771b20e07a5086d5c3fe743fd2907b194befa9dd26fecaf8ea04" } } "ClientInfo" { - "valid_until" "1611062209" + "valid_until" "1630963824" "ip_country_code" "US" } } diff --git a/desktop/last-release b/desktop/last-release index aabe6ec3..f64f5d8d 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -21 +27 diff --git a/desktop/project.clj b/desktop/project.clj index c41ecf4f..363f1c7c 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -67,18 +67,18 @@ :aot :all :warn-on-reflection true} - :steam {:dependencies [[com.code-disaster.steamworks4j/steamworks4j "1.2.2"]] + :steam {:dependencies [[com.code-disaster.steamworks4j/steamworks4j "1.2.3"]] :jvm-opts ["-Dis-desktop=true" "-Dui_scale=1.0" "-Dplatform=desktop"]} :non-steam { :jvm-opts ["-Dis-desktop=true" "-Dui_scale=1.0" "-Dplatform=desktop"]} :steam-dev { :source-paths ["src" "src-common" "src-dev"] - :jvm-opts ["-Duse-repl=true" "-Dui_scale=1.0" "-Dis-desktop=true" "-Dplatform=desktop"] - :dependencies [[com.badlogicgames.gdx/gdx-tools "1.9.5"] + :jvm-opts ["-Duse-repl=true" "-Dui_scale=1.0" "-Dis-desktop=true" "-Dplatform=desktop" "-XstartOnFirstThread" ] + :dependencies [#_[com.badlogicgames.gdx/gdx-tools "1.9.5"] [org.clojure/tools.nrepl "0.2.7"] [play-clj-nrepl "0.1.0" :exclusions [play-clj]] [slamhound "1.5.5"] [org.clojure/data.csv "0.1.3"] - [com.code-disaster.steamworks4j/steamworks4j "1.2.2"]] + [com.code-disaster.steamworks4j/steamworks4j "1.2.3"]] :aot :all :warn-on-reflection true} diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index 22fb24a5..95bb6642 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -756,6 +756,7 @@ :none)) (log/info "Entering room " new-background ) (screen! dialogue/talking-screen :stop-talk { :id :bg-actions}) + (run-action entities (begin [this screen entities] (utils/stop-all-sounds! entities) diff --git a/desktop/src-common/advent/saves.clj b/desktop/src-common/advent/saves.clj index 39b38a26..eae7c4fd 100644 --- a/desktop/src-common/advent/saves.clj +++ b/desktop/src-common/advent/saves.clj @@ -1,7 +1,7 @@ (ns advent.saves) (def chapters - {:chapter-1 nil + {:chapter-1 {:state {:y 54.93726516381327, :active? true, :plaques-read #{}, :time :intro, :inventory [], :seen-intro? false, :clues #{}, :hud-active? false, :x 139.7490606552531, :last-room :dream, :mints-eaten 0, :object nil, :obtained-items #{}}} :chapter-2 nil :chapter-3 nil :chapter-4 nil diff --git a/desktop/src-common/advent/screens/rooms/cat_tree.clj b/desktop/src-common/advent/screens/rooms/cat_tree.clj index c8c52ae2..bbcf0136 100644 --- a/desktop/src-common/advent/screens/rooms/cat_tree.clj +++ b/desktop/src-common/advent/screens/rooms/cat_tree.clj @@ -319,23 +319,29 @@ :cursor :hand :label "Suspicous looking rock" :script (actions/get-script entities - (when (and (actions/has-obtained? entities :note-1) + (if (and (actions/has-obtained? entities :note-1) (not (actions/has-obtained? entities :walkie-talkies))) - (actions/walk-to entities :ego [85 99]) - (actions/play-animation entities :ego :squat) - (actions/do-dialogue entities - :ego "Hey! A little lever." - :ego "I think this is Gandarf's secret stash of helpful stuff.") - (actions/play-animation entities :ego :squat) - (actions/give entities :alarm-clock) - (actions/do-dialogue entities :ego "What is this?") - (actions/play-animation entities :ego :squat) - (actions/give entities :camera) - (actions/do-dialogue entities :ego "These are all really strange devices.") - (actions/play-animation entities :ego :squat) - (actions/give entities :walkie-talkies) - (actions/talk entities :ego "Tin cans connected with string?") - (actions/do-dialogue entities :ego "I wonder what all of these magic devices do.")))} + (do + (actions/walk-to entities :ego [85 99]) + (actions/play-animation entities :ego :squat) + (actions/do-dialogue entities + :ego "Hey! A little lever." + :ego "I think this is Gandarf's secret stash of helpful stuff.") + (actions/play-animation entities :ego :squat) + (actions/give entities :alarm-clock) + (actions/do-dialogue entities :ego "What is this?") + (actions/play-animation entities :ego :squat) + (actions/give entities :camera) + (actions/do-dialogue entities :ego "These are all really strange devices.") + (actions/play-animation entities :ego :squat) + (actions/give entities :walkie-talkies) + (actions/talk entities :ego "Tin cans connected with string?") + (actions/do-dialogue entities :ego "I wonder what all of these magic devices do.")) + (do + (actions/walk-to entities :ego [85 99]) + (actions/play-animation entities :ego :squat) + (actions/do-dialogue entities + :ego "I've looted everything in here!"))))} :grass {:box [26 105 60 160] :cursor :hand :label "Grass" @@ -492,7 +498,55 @@ :flask-water-flies (try-flask) :flask-flies-ash (try-flask) :spell-component (try-flask) - + :glass-eye (actions/get-script entities + (cond + (actions/has-obtained? entities :feather) + (do (actions/walk-to entities :ego [141 54] :face :right) + (actions/do-dialogue entities + :ego "Could you use this as a monocle?" + :owl "You already gave me my monocle, silly boy!")) + (get-in @entities [:state :wants-monocle?]) + (do + (actions/walk-to entities :ego [141 54] :face :right) + (actions/do-dialogue entities + :ego "Could you use this glass eye as a monocle?" + :owl "It is the choicest of eyes." + :owl "But a human eye won't fit.") + (do-puke entities)) + + :else + (actions/talk entities :ego "Why would an owl want that?"))) + + :motivational-tapes (actions/get-script entities + (cond + (get-in @entities [:state :wants-monocle?]) + (do + (actions/walk-to entities :ego [141 54] :face :right) + (actions/do-dialogue entities + :ego "Could these motivational tapes help you hunt?" + :owl "I already have the strength of will." + :owl "Just not the strength of stomach.") + (do-puke entities)) + + :else + (actions/talk entities :ego "Why would an owl want that?"))) + + :earplugs (actions/get-script entities + (cond + (get-in @entities [:state :wants-monocle?]) + (do + (actions/walk-to entities :ego [141 54] :face :right) + (actions/do-dialogue entities + :ego "Could these earplugs help you hunt?" + :owl "No, I rely on my hearing too much.") + (do-puke entities)) + + :else + (actions/talk entities :ego "Why would an owl want that?"))) + + + + :flask-1-strength (actions/get-script entities (cond (get-in @entities [:state :wants-monocle?]) diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index bfdabbf1..3005dffd 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -123,6 +123,7 @@ (fn [screen entities] (tween/tween :arm-y screen [:room :entities :arm :y] 240 70 3.0 :ease tween/ease-linear))) + (actions/transition-background entities :tongue-fight [141 240]) (actions/walk-straight-to entities :ego [141 110] :anim :tongue-idle :speed 4.0)) diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 13b9a779..31e4aedd 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -140,7 +140,7 @@ :script (actions/get-script entities (actions/talk entities :ego "That's my house. I'd rather play outside."))} :sherrif-house {:box [138 143 160 168] - :label "Sherriff's house" + :label "Sheriff's house" :cursor :look :script (actions/get-script entities (actions/do-dialogue entities diff --git a/desktop/src-common/advent/screens/rooms/tongue_fight.clj b/desktop/src-common/advent/screens/rooms/tongue_fight.clj index 23892e7c..28070bbb 100644 --- a/desktop/src-common/advent/screens/rooms/tongue_fight.clj +++ b/desktop/src-common/advent/screens/rooms/tongue_fight.clj @@ -364,6 +364,7 @@ :scale-fn (constantly 1.0) :start-pos [141 110] :apply-state (fn [screen e] + (screen! @(resolve 'advent.screens.scene/hud) :on-tongue-fight {}) (-> e (update-in [:room :entities :ego] #(actions/start-animation screen % :tongue-idle)) (assoc-in [:room :entities :ego :stand-override] :tongue-idle) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index ee4ec64a..0b2283d5 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1515,7 +1515,6 @@ ))) :on-tap (fn [screen entities options] - (println "tapping") (when utils/mobile? (handle-touch-up screen entities options))) @@ -1551,6 +1550,7 @@ (screen! toast-screen :on-toast { :message (str "Saved \"" save-name "\"")})))) :on-menu (fn [{:keys [viewport] :as screen} entities options] + (println "HERE TESTTTT") (when-not (or (get-in entities [:tweens :fade-out]) (get-in entities [:tweens :fade-in])) @@ -1621,7 +1621,7 @@ (let [scene-entities (-> scene :entities deref)] (and (not (get-in scene-entities [:fg-actions :script-running?])) (get-in scene-entities [:state :active?]) - (not= (get-in scene-entities [:state :last-room]) :tongue-fight) + (= 0.0 (get-in scene-entities [:fade :opacity]))))) (defmulti transition-hud (fn [screen entities new-state state-data] @@ -1960,11 +1960,15 @@ :x (- 320 (* utils/ui-scale 16) 4) :y 240 :origin-x 16 :origin-y 16 :width 16 :height 16 + :enabled? (not= (get-in (-> scene :entities deref) [:state :last-room]) + :tongue-fight) :baseline 9000 :opacity 0.8) :inventory (assoc (utils/atlas->texture global-atlas "inventory") :x (* 21 utils/ui-scale ) :y (* 27 utils/ui-scale ) :baseline 9000 :intersect-width 42 :intersect-height 48 :width 42 :height 56 + :enabled? (not= (get-in (-> scene :entities deref) [:state :last-room]) + :tongue-fight) :origin-x 21 :origin-y 27 :scale-x utils/ui-scale :scale-y utils/ui-scale :open (utils/flip (doto (utils/make-anim-seq global-atlas "open-inventory" [42 56] 0.055 (flatten [(range 6) 6 7 8 7 ])) @@ -1981,6 +1985,13 @@ :fps (->> (assoc (label "" (color :white) ) :y 10 :x 280 :baseline 0 :opacity 0.1) (utils/add-actor-to-stage screen))})) + :on-tongue-fight + (fn [screen entities options] + (println "OPTIONS ARE" screen) + (-> entities + (assoc-in [:inventory :enabled?] false) + (assoc-in [:save :enabled?] false))) + :on-render (fn [{:keys [^FitViewport viewport] :as screen} entities options] (.apply viewport) @@ -2008,17 +2019,22 @@ (update-in entities [:save] assoc :r 0.75 :g 0.75 :b 0.75) (grow-hud screen entities :save false))) - entities (or (process-fsm screen entities) entities)] + entities (or (process-fsm screen entities) entities) + on-tongue-fight? (= :tongue-fight + (get-in (-> scene :entities deref) [:state :last-room]))] #_(label! (:fps entities) :set-text (str (game :fps))) - (render-one screen (if (and hud-interactable? (not (:already-saved? entities))) - (:save entities) - (assoc (:save entities) :opacity 0.5))) - (render-one screen (if hud-interactable? - (:inventory entities) - (assoc (:inventory entities) :opacity 0.5))) + (when (:enabled? (:save entities)) + (render-one screen (if (and hud-interactable? (not (:already-saved? entities))) + (:save entities) + (assoc (:save entities) :opacity 0.5)))) + + (when (:enabled? (:inventory entities)) + (render-one screen (if hud-interactable? + (:inventory entities) + (assoc (:inventory entities) :opacity 0.5)))) (render-one screen (:selected-item entities)) (render-one screen (:close entities)) entities)) @@ -2116,6 +2132,7 @@ :on-tap (fn [screen entities options] + (println "is enabled?" (:enabled? (:inventory entities))) (if (= (button-code :left) (:button options)) (let [[x y] (utils/unproject screen options)] (cond @@ -2123,7 +2140,8 @@ nil - (utils/intersects? (:inventory entities) [x y]) + (and (utils/intersects? (:inventory entities) [x y]) + (:enabled? (:inventory entities))) (if (= :selected (get-in entities [:inv-fsm :state])) (update-in entities [:inv-fsm :pending-states] conj [:none (get-in entities [:inv-fsm :state-data])]) @@ -2135,7 +2153,7 @@ (utils/intersects? (:close entities) [x y]) (screen! scene :on-menu {}) - (and (not (:already-saved? entities)) (utils/intersects? (:save entities) [x y]) (hud-interactable?)) + (and (not (:already-saved? entities)) (utils/intersects? (:save entities) [x y]) (hud-interactable?) (:enabled? (:save entities))) (do (screen! scene :on-save {}) (assoc entities :already-saved? true)) diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj index 8afe9b86..3e70affb 100644 --- a/desktop/src/advent/core/desktop_launcher.clj +++ b/desktop/src/advent/core/desktop_launcher.clj @@ -36,11 +36,14 @@ #_(.setForegroundFPS 60) (.setHdpiMode Lwjgl3ApplicationConfiguration$HdpiMode/Pixels) (.setTitle "Tick's Tales: Up All Knight") - (.setWindowIcon (into-array ["icon/icon128x128.png" - "icon/icon32x32.png" - "icon/icon16x16.png"]))) + (.setWindowIcon (into-array ["icon/icon_128x128.png" + "icon/icon_32x32.png" + "icon/icon_16x16.png"])) + (.setWindowedMode (* 640 2) (* 480 2))) #_(set! (.foregroundFPS cfg) 60) #_(set! (.backgroundFPS cfg) 60) + #_(set! (.windowWidth cfg) (* 640 2)) + #_(set! (.windowHeight cfg) (* 480 2)) (System/setProperty "org.lwjgl.opengl.Display.enableHighDPI" "false") (System/setProperty "org.lwjgl.opengl.Display.disableOSXFullscreenModeAPI" "true") #_(System/setProperty "org.lwjgl.opengl.Window.undecorated", "true") diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index 599ec397..201caf3d 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.12 + 2.0.18 CFBundleSignature ???? CFBundleVersion - 149 + 151 CFBundleIconName AppIcon MinimumOSVersion diff --git a/ios/project.clj b/ios/project.clj index e2184c50..310f80f4 100644 --- a/ios/project.clj +++ b/ios/project.clj @@ -1,8 +1,8 @@ (def version (str "2.0." (clojure.string/trim-newline (slurp "../desktop/last-release")) "-snapshot")) (defproject advent version :description "FIXME: write description" - :dependencies [[com.badlogicgames.gdx/gdx "1.9.4"] - [com.badlogicgames.gdx/gdx-backend-robovm "1.9.4"] + :dependencies [[com.badlogicgames.gdx/gdx "1.9.5"] + [com.badlogicgames.gdx/gdx-backend-robovm "1.9.5"] [org.clojure/core.async "0.2.385"] [org.clojars.notid/tools.logging "0.3.2-SNAPSHOT"] [log4j/log4j "1.2.16"]