Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry

1 files changed, 53 insertions, 53 deletions

diff --git a/locale/en.ini b/locale/en.ini
index ea798258..b2e8c6d0 100644
--- a/locale/en.ini
+++ b/locale/en.ini
@@ -3,18 +3,18 @@ c.chat.write_message=Write messsage
 c.credits.developed_by=developed by
 c.credits.models=Models
 c.credits.sounds=Sounds
-c.credits.translations=Translations
 c.credits.thanks=Thank You For Playing
 c.credits.title=Hurry Curry! - a game about cooking
+c.credits.translations=Translations
 c.error.cannot_cancel_no_game=Cannot cancel game since no game is running.
+c.error.empty_username=Username cannot be empty.
 c.error.must_join_to_cancel=You must join in order to be able to cancel the current game.
 c.error.placeholder=This should be the error message.
+c.error.server=Error from server: {0}
 c.error.version_mismatch=Server and client versions do not match. Server: {0}.{1}, Client: {2}.{3}.%nAre you sure the game is up to date?
 c.error.websocket.unavailable=unavailable
 c.error.websocket=WebSocket closed with code: {0}, reason {1}. Clean: {2}
 c.error=Error
-c.error.server=Error from server: {0}
-c.error.empty_username=Username cannot be empty.
 c.hint.boost=Press {0} to boost
 c.hint.framerate_low=Your framerate seems to be low. You can lower your graphics settings in the settings menu.
 c.hint.interact=Press {0} to pick up items and to interact with tools
@@ -51,30 +51,31 @@ c.menu.play.quick_connect=Quick Connect
 c.menu.play.server=Server
 c.menu.play=Play
 c.menu.quit=Quit
+c.menu.rating.accept=Accept
 c.menu.settings=Settings
-c.score.poor=Poor service
 c.score.acceptable=Acceptable service
-c.score.good=Good service
-c.score.excellent=Excellent service
 c.score.completed=Completed
+c.score.excellent=Excellent service
 c.score.failed=Failed
+c.score.good=Good service
 c.score.points_par=You collected {0} points
 c.score.points=Points
+c.score.poor=Poor service
 c.score.time_remaining=Time remaining
 c.settings.apply=Save & Apply
 c.settings.audio.master_volume=Master Volume
 c.settings.audio.music_volume=Music Volume
 c.settings.audio.sfx_volume=SFX Volume
 c.settings.audio=Audio
+c.settings.gameplay.accessible_movement=Accessible movement controls
+c.settings.gameplay.first_person=Enable first-person mode (reduces playability)
+c.settings.gameplay.hints_started=Hints started
 c.settings.gameplay.interpolate_camera_rotation=Smooth camera rotation
 c.settings.gameplay.invert_camera=Invert camera movement
 c.settings.gameplay.latch_boost=Always extend boost to maximum duration
 c.settings.gameplay.setup_completed=Initial setup complete. (Uncheck and restart to reenter)
 c.settings.gameplay.tutorial_disabled=Disable tutorial
-c.settings.gameplay.hints_started=Hints started
 c.settings.gameplay.usernames=Show username tags
-c.settings.gameplay.accessible_movement=Accessible movement controls
-c.settings.gameplay.first_person=Enable first-person mode (reduces playability)
 c.settings.gameplay=Gameplay
 c.settings.graphics.aa.disabled=Disabled
 c.settings.graphics.aa.fx=FXAA
@@ -137,6 +138,11 @@ c.settings.input.zoom_in=Zoom in
 c.settings.input.zoom_out_discrete=Zoom out (discrete)
 c.settings.input.zoom_out=Zoom out
 c.settings.input=Controls
+c.settings.online.discovery_binary=mDNS discovery binary path
+c.settings.online.registry_url=Registry URL
+c.settings.online.use_discovery=Use mDNS discovery
+c.settings.online.use_registry=Use global server registry
+c.settings.online=Online
 c.settings.server.binary_path=Server binary path
 c.settings.server.data_path=Server data directory path
 c.settings.server.mdns=Local server discoverability
@@ -156,78 +162,72 @@ c.settings.ui.touch_controls.enabled=Enabled
 c.settings.ui.touch_controls=Enable touch screen controls
 c.settings.ui=User interface
 c.settings.username=Username
-c.setup.contract_title=EMPLOYMENT CONTRACT
-c.setup.contract_desc=This is a binding contract between you (the employee) and Musterfoods Ltd. (the employer) for working as a chef or waiter.
-c.setup.name=1. [b]Name of the Employee[/b] Please fill out your name. Other chefs can see your name on your name tag.
-c.setup.position=2. [b]Employment Position[/b]
-c.setup.position.value=Chef / Waiting Staff
-c.setup.uniform=3. [b]Working Uniform.[/b] You must always have one of the following hairstyles.
-c.setup.experience=4. [b]Experience.[/b] Do you have any prior job experience, or would you like us to show you around the kitchen?
-c.setup.experience.skip=Skip tutorial
-c.setup.duties=5. [b]Duties.[/b] It is your duty to serve customers the meal or item that they request.%n
 c.setup.additional_terms=6. [b]Additional Terms.[/b] You shall not duplicate plates. (That is [u]NOT[/u] possible!)%n
-c.setup.compensation=7. [b]Compensation.[/b] You will be compensated monthly for your work.
 c.setup.compensation.salary.prefix=The salary is
-c.setup.compensation.salary=$ 0.00
 c.setup.compensation.salary.suffix=per month
-c.setup.frank_signature=F. Miller
+c.setup.compensation.salary=$ 0.00
+c.setup.compensation=7. [b]Compensation.[/b] You will be compensated monthly for your work.
+c.setup.contract_desc=This is a binding contract between you (the employee) and Musterfoods Ltd. (the employer) for working as a chef or waiter.
+c.setup.contract_title=EMPLOYMENT CONTRACT
+c.setup.duties=5. [b]Duties.[/b] It is your duty to serve customers the meal or item that they request.%n
+c.setup.experience.skip=Skip tutorial
+c.setup.experience=4. [b]Experience.[/b] Do you have any prior job experience, or would you like us to show you around the kitchen?
 c.setup.frank_signature.desc=Signature of the Employer:%nMusterfoods Ltd.%nFrank Miller, Head of HR
-c.setup.user_signature=Click to sign
+c.setup.frank_signature=F. Miller
+c.setup.name=1. [b]Name of the Employee[/b] Please fill out your name. Other chefs can see your name on your name tag.
+c.setup.position.value=Chef / Waiting Staff
+c.setup.position=2. [b]Employment Position[/b]
+c.setup.uniform.value=Hairstyle {0}
+c.setup.uniform=3. [b]Working Uniform.[/b] You must always have one of the following hairstyles.
 c.setup.user_signature.desc=Signature of the Employee:%n%n%n
+c.setup.user_signature=Click to sign
+s.bot.frank=Frank Miller
 s.bot.simple=Simple chef
 s.bot.waiter=Waiter
-s.bot.frank=Frank Miller
-s.tutorial.prevent_burning=Take this before it burns
-s.tutorial.take_now=Take this item quickly!
-s.tutorial.active=Interact here for {0}s
+s.campaign.condition.stars=Reach at least {0} stars in {1}
+s.campaign.list_helper=- {0}%n - {1}
+s.campaign.unlock_condition=To unlock: %n%n{0}
+s.error.already_interacting=already interacting
+s.error.conn_too_many_players=Players-per-connection limit exceeded.
+s.error.customer_interact=You shall not interact with customers.
+s.error.interacting_too_far=interacting too far from player
+s.error.map_load=Map failed to load: {0}
+s.error.no_player=Player does not exist.
+s.error.no_tile=Tile does not exist.
+s.error.packet_not_supported=Packet not supported in this session.
+s.error.packet_sender_invalid=Packet sent to a player that is not owned by this connection.
+s.error.self_interact=Interacting with yourself. This is impossible.
+s.replay.cannot_join=Replays cannot be joined.
+s.state.abort_no_players=Game was aborted due to a lack of players.
+s.state.game_aborted=Game was aborted by {0}.
+s.state.overflow_resubscribe=Lagging behind. Some clientbound packets were dropped.
+s.tutorial.accept_order=Approach the customer take their order
 s.tutorial.active_cuttingboard=Cut the item to slices here
+s.tutorial.active=Interact here for {0}s
 s.tutorial.clear_tile=Clear this tile
 s.tutorial.error=Tutorial code handle this recipe yet.
 s.tutorial.finished=Tutorial finished!
 s.tutorial.hold_interact=Hold interact
 s.tutorial.interact_empty=Interact with an empty counter
-s.tutorial.interact=Interact here
 s.tutorial.interact_plate=Add the item to this plate
+s.tutorial.interact=Interact here
 s.tutorial.pickup=Take this item.
+s.tutorial.prevent_burning=Take this before it burns
 s.tutorial.put_away=Put away this item for later
 s.tutorial.put_on=Place on {0}
-s.tutorial.take=Take {0} from here
 s.tutorial.serve=Serve the meal here
+s.tutorial.take_now=Take this item quickly!
+s.tutorial.take=Take {0} from here
 s.tutorial.wait_finish=...
-s.tutorial.accept_order=Approach the customer take their order
-s.replay.cannot_join=Replays cannot be joined.
-s.campaign.unlock_condition=To unlock: %n%n{0}
-s.campaign.list_helper=- {0}%n - {1}
-s.campaign.condition.stars=Reach at least {0} stars in {1}
-s.state.abort_no_players=Game was aborted due to a lack of players.
-s.state.game_aborted=Game was aborted by {0}.
-s.state.overflow_resubscribe=Lagging behind. Some clientbound packets were dropped.
-s.error.conn_too_many_players=Players-per-connection limit exceeded.
-s.error.packet_sender_invalid=Packet sent to a player that is not owned by this connection.
-s.error.no_player=Player does not exist.
-s.error.no_tile=Tile does not exist.
-s.error.already_interacting=already interacting
-s.error.interacting_too_far=interacting too far from player
-s.error.self_interact=Interacting with yourself. This is impossible.
-s.error.customer_interact=You shall not interact with customers.
-s.error.packet_not_supported=Packet not supported in this session.
-s.error.map_load=Map failed to load: {0}
 unknown33=Automatic
 unknown336=Return to Main Menu
-unknown37=Enabled
-unknown41=Disabled
-unknown460=+
-unknown464=-
 unknown476=SHIFT
 unknown484=left stick
 unknown488=SPACE
 unknown514=arrow keys
 unknown518=right stick
 unknown551=unavailable
-c.setup.uniform.value=Hairstyle {0}
 unknown622=You must fill out all requested fields.
-unknown626=Accept
 unknown732=Previous
 unknown736=Next
-unknown740=Join / Spectate
 unknown752=Scroll down