diff options
| -rw-r--r-- | client/makefile | 6 | ||||
| -rw-r--r-- | locale/eu.ini | 23 | ||||
| -rw-r--r-- | locale/it.ini | 34 | ||||
| -rw-r--r-- | locale/nl.ini | 2 | ||||
| -rw-r--r-- | locale/tools/src/main.rs | 7 | ||||
| -rw-r--r-- | locale/zh_Hans.ini | 2 | ||||
| -rw-r--r-- | readme.md | 10 |
7 files changed, 75 insertions, 9 deletions
diff --git a/client/makefile b/client/makefile index b7524ff0..bde22f11 100644 --- a/client/makefile +++ b/client/makefile @@ -14,7 +14,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. # .PHONY: assets clean all locales -all: assets locales icons/adaptive-background.png icons/adaptive-foreground.png +all: .godot/import-finished assets locales icons/adaptive-background.png icons/adaptive-foreground.png assets: menu/book/book_01.webp locales: $(patsubst ../locale/%.ini,po/%.po,$(wildcard ../locale/*.ini)) @@ -24,6 +24,10 @@ clean: rm -f menu/book/book_*.webp rm -f icons/adaptive-foreground.png icons/adaptive-background.png +.godot/import-finished: + godot --headless --import project.godot + touch $@ + menu/book/book_01.webp: @echo Downloading recipe book... @mkdir -p menu/book diff --git a/locale/eu.ini b/locale/eu.ini index 4e032f16..a5067320 100644 --- a/locale/eu.ini +++ b/locale/eu.ini @@ -89,7 +89,7 @@ c.settings.gameplay=Jokoa c.settings.gameplay.latch_boost=Beti luzatu bultzada iraupen luzeenera c.settings.graphics.gi=Argiztapen orokorra c.settings.graphics.gi.sdfgi=SDFGI -c.settings.graphics.gi.voxelgi=Voxel GI +c.settings.graphics.gi.voxelgi=VoxelGI c.settings.graphics.glow=Gaitu distira c.settings.graphics=Grafikoak c.settings.graphics.aa=Anti-aliasinga @@ -245,3 +245,24 @@ s.error.interacting_too_far = elkarreragiteko jokalariarengandik urrunegi s.error.customer_interact = Ez zenuke bezeroekin elkarreragin behar. c.hint.join_while_running = Sakatu {0} eta klikatu "Sartu" jokoa martxan dagoen bitartean sartzeko s.error.packet_not_supported = Pakete hau ez da saio honetan onartzen. +s.bot.dishwasher = Plater garbigailua +s.tutorial.error = Tutorialean ez dago errezeta hau oraindik. +s.tutorial.interact_plate = Gehitu objektua platerera +c.settings.online.registry_url = Erregistratu URLa +c.settings.online.use_discovery = Erabili mDNS arakatzailea +c.settings.online.discovery_binary = mDNS arakatzailearen exekutagarri bidea +c.settings.online.use_registry = Erabili zerbitzarien erregistro orokorra +c.settings.online = Online +s.tutorial.accept_order = Hurbildu bezeroarengana eskaera hartzera +s.tutorial.active_cuttingboard = Moztu objektua xerratan hemen +c.menu.play.fetching_list = Zerbitzari zerrenda lortzen... +c.menu.play.list_item = {0} ({1} jokalari) +c.menu.play.server_binary_not_found = Zerbitzariaren exekutagarria ez da aurkitu. Instalatu zerbitzaria bere aldetik, mesedez. +c.menu.play.server_failed_tooltip = Zerbitzarian errorea egon da edo beste moduren batean bukatu dut.%nZerbitzaria komando-lerrotik abiarazten saiatu behar zenuke. +c.menu.play.server_failed = Zerbitzaria (huts egin du) +c.menu.play.server_start = Hasi zerbitzaria +c.menu.play.server_starting = Zerbitzaria hasten... +c.menu.play.server_stop = Gelditu zerbitzaria +c.menu.play.server_testing = Zerbitzaria (probatzen) +c.menu.play.server_unavailable = Zerbitzaria (eskuraezina) +c.settings.gameplay.vibration = Gaitu dardarak diff --git a/locale/it.ini b/locale/it.ini index 8b137891..b550939d 100644 --- a/locale/it.ini +++ b/locale/it.ini @@ -1 +1,33 @@ - +[hurrycurry] +c.setup.additional_terms = [b]Termini Aggiuntivi.[/b]Non duplicare i piatti. (Ciò [u]NON[/u] è possibile!)%n +c.credits.developed_by = sviluppato da +c.credits.thanks = Grazie Per Aver Giocato +c.settings.graphics.fullscreen = Schermo intero +s.tutorial.pickup = Prendi questo oggetto. +c.map.difficulty.0 = Facile +c.map.difficulty.1 = Difficile +c.map.difficulty.4 = Molto difficile +c.map.difficulty = Difficoltà +c.menu.ingame.main_menu = Menù principale +c.menu.lobby.players = Giocatori +c.menu.play.server_stop = Ferma il server +c.menu.play = Gioca +c.menu.quit = Esci +c.menu.settings = Impostazioni +c.score.acceptable = Servizio accettabile +c.score.excellent = Servizio eccellente +c.score.poor = Servizio scarso +c.score.time_remaining = Tempo rimanente +c.settings.apply = Applica e salva +c.settings.graphics.fullscreen.always = Sempre +s.bot.simple = Chef semplice +s.bot.waiter = Cameriere +s.tutorial.interact = Interagisci qui +c.error.server = Errore dal server: {0} +c.menu.play.server_starting = Il server sta partendo... +c.settings.input = Controlli +s.bot.dishwasher = Lavapiatti +c.menu.play.server_start = Avvia il server +c.settings.gameplay.first_person = Attiva la modalità in prima persona (riduce la giocabilità) +c.settings.graphics.fullscreen.never = Mai +c.setup.compensation.salary.suffix = al mese diff --git a/locale/nl.ini b/locale/nl.ini index d6b1804b..31f4e408 100644 --- a/locale/nl.ini +++ b/locale/nl.ini @@ -261,3 +261,5 @@ c.menu.play.server_stop = Server afsluiten c.menu.play.server_testing = Server (test) c.menu.play.server_unavailable = Server (niet beschikbaar) c.settings.online.use_registry = Globaal serverregister gebruiken +s.bot.dishwasher = Vaatwasser +c.settings.gameplay.vibration = Trillingen inschakelen diff --git a/locale/tools/src/main.rs b/locale/tools/src/main.rs index 7675b4d6..5e97993b 100644 --- a/locale/tools/src/main.rs +++ b/locale/tools/src/main.rs @@ -64,14 +64,19 @@ static NATIVE_LANGUAGE_NAMES: &[(&str, &str)] = &[ fn export_load(input: &Path, fallback: Option<PathBuf>) -> Result<BTreeMap<String, String>> { let mut ini = load_ini(&input)?; if let Some(fallback) = fallback { + let mut missing = 0; let f = load_ini(&fallback)?; for (k, v) in f { #[allow(clippy::map_entry)] if !ini.contains_key(&k) { - eprintln!("fallback: key {k:?} is missing"); + if option_env!("SHOW_MISSING").is_some() { + eprintln!("fallback: key {k:?} is missing"); + } + missing += 1; ini.insert(k, v); } } + eprintln!("-- {missing} missing keys were substituted from fallback language") } for &(code, name) in NATIVE_LANGUAGE_NAMES { ini.insert(format!("c.settings.ui.language.{code}"), name.to_owned()); diff --git a/locale/zh_Hans.ini b/locale/zh_Hans.ini index fb307063..f118ceee 100644 --- a/locale/zh_Hans.ini +++ b/locale/zh_Hans.ini @@ -268,3 +268,5 @@ c.menu.play.server_starting = 服务器正在启动… c.menu.play.server_stop = 停止服务器 c.menu.play.server_testing = 服务器（测试） c.menu.play.server_unavailable = 服务器（不可用） +s.bot.dishwasher = 洗碗机 +c.settings.gameplay.vibration = 启用振动 @@ -25,7 +25,7 @@ The protocol is documented in [protocol.md](protocol.md). ### Building - Requirements: - - Godot 4.2 + - Godot 4.3 - cURL (only if book is required) - Nightly rust toolchain (only if locales are required) @@ -44,17 +44,17 @@ godot --import client/project.godot - Requirements: - Nightly rust toolchain - - Deno + - Deno (or Node.js in which case you need to pass `JSR=node` to make) ``` -make test-client +make data server ``` ### Usage - Ensure the `data` directory is available **contained within** (not is) either the process working directory of the server or in /usr/share/hurrycurry (or - similar). Running the server in the source folder should work. + similar). Running the server in the repository root should work. - Run the server: `./target/release/hurrycurry-server` ## Pixel Client @@ -63,7 +63,7 @@ make test-client - Requirements: - Nightly rust toolchain - - SDL2 development libraries + - SDL2 development libraries (including gfx, ttf and mixer extensions) ``` make pixel-client |