Skip to content

Commit

Permalink
Merge branch 'languages' into clean
Browse files Browse the repository at this point in the history
# Conflicts:
#	game/tl/Russian/code/base/pda_screen.po
#	game/tl/Russian/code/base/screens.po
#	game/tl/Russian/code/battle/fight_Dash.po
#	game/tl/italian/code/base/pda_screen.po
#	game/tl/spanish/code/base/computer.po
#	game/tl/spanish/code/base/controls.po
#	game/tl/spanish/code/base/pda_screen.po
#	game/tl/spanish/code/base/screens.po
#	game/tl/spanish/code/battle/fight_Dash.po
#	game/tl/spanish/code/battleoverhaul/battlesetup.po
#	game/tl/spanish/code/battleoverhaul/newbattle.po
#	game/tl/spanish/code/battleoverhaul/renpy/9999-battle-label.po
#	game/tl/spanish/code/character_events/desiree/desiree_affection_scenes.po
#	game/tl/spanish/code/character_events/jack/jack_training_machine.po
#	game/tl/spanish/code/character_events/jazz/jazz_yoga.po
#	game/tl/spanish/code/character_events/lily/lily_introduction.po
#	game/tl/spanish/code/character_events/maddie/maddie_breakfast.po
#	game/tl/spanish/code/character_events/maddie/maddie_staying_home.po
#	game/tl/spanish/code/character_events/maddie/maddie_tv.po
#	game/tl/spanish/code/character_events/maddie/maddie_yoga.po
#	game/tl/spanish/code/character_events/paulina/paulina_spookchat.po
#	game/tl/spanish/code/character_events/sam/sam_spookchat_selfie.po
#	game/tl/spanish/code/character_events/star/star_gym_running.po
#	game/tl/spanish/code/character_events/valerie/valerie_nasty_burger_soda_incident.po
#	game/tl/spanish/code/episodes/episode_1/episode1_MZ.po
#	game/tl/spanish/code/episodes/episode_1/episode_1_side_quest_Paulina.po
#	game/tl/spanish/code/episodes/episode_2/episode2_MZ.po
#	game/tl/spanish/code/episodes/episode_2/episode_2_pda_side_quest.po
#	game/tl/spanish/code/episodes/episode_3/episode3_MZ.po
#	game/tl/spanish/code/episodes/episode_4/episode4_MZ.po
#	game/tl/spanish/code/episodes/episode_4/episode_4_cylindrical.po
#	game/tl/spanish/code/episodes/episode_4/episode_4_p_phantom.po
#	game/tl/spanish/code/episodes/episode_4/episode_4_twinkle_twinkle.po
#	game/tl/spanish/code/episodes/episode_5/episode5_MZ.po
#	game/tl/spanish/code/episodes/episode_5/episode_5_casual_night.po
#	game/tl/spanish/code/episodes/episode_6/episode6_MZ.po
#	game/tl/spanish/code/episodes/episode_7/episode7_MZ.po
#	game/tl/spanish/code/episodes/episode_8/episode8_MZ.po
#	game/tl/spanish/code/episodes/episodes_selection.po
#	game/tl/spanish/code/locations/AbYss_MZ.po
#	game/tl/spanish/code/locations/Nasty_Burger_Interaction_MZ.po
#	game/tl/spanish/code/locations/home/house_misc.po
#	game/tl/spanish/code/locations/home/laundry_room.po
#	game/tl/spanish/code/locations/mall/mall_parking_lot.po
#	game/tl/spanish/code/locations/mystery_shop_MZ.po
#	game/tl/spanish/code/locations/sam_home.po
#	game/tl/spanish/code/locations/school/school_misc.po
#	game/tl/spanish/code/locations/town/nasty_burger.po
#	game/tl/spanish/code/locations/town/town_map_1.po
  • Loading branch information
BlackRam-oss committed Feb 6, 2024
2 parents 913531d + ae01995 commit 5daf648
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 5daf648

Please sign in to comment.