Merge branch 'languages' into clean

# Conflicts:
#	.gitignore
#	game/tl/Russian/character customization.po
#	game/tl/Spanish/9999-battle-label.po
#	game/tl/Spanish/Transition.po
#	game/tl/Spanish/battlesetup.po
#	game/tl/Spanish/character customization.po
#	game/tl/Spanish/computer.po
#	game/tl/Spanish/controls.po
#	game/tl/Spanish/desiree_affection_scenes.po
#	game/tl/Spanish/episode3_MZ.po
#	game/tl/Spanish/episode4_MZ.po
#	game/tl/Spanish/episode8_MZ.po
#	game/tl/Spanish/fight_Dash.po
#	game/tl/Spanish/fight_ghost_bathroom.po
#	game/tl/Spanish/fight_ghosts.po
#	game/tl/Spanish/fight_shadow.po
#	game/tl/Spanish/maddie_breakfast.po
#	game/tl/Spanish/maddie_staying_home.po
#	game/tl/Spanish/maddie_tv.po
#	game/tl/Spanish/maddie_yoga.po
#	game/tl/Spanish/newbattle.po
#	game/tl/Spanish/options.po
#	game/tl/Spanish/pda_screen.po
#	game/tl/Spanish/screens.po
#	game/tl/french/9999-battle-label.po
#	game/tl/french/AbYss_MZ.po
#	game/tl/french/Desiree_Dialogue.po
#	game/tl/french/Jack_Dialogue_1_MZ.po
#	game/tl/french/Maddie_Dialogue_1_MZ.po
#	game/tl/french/Nasty_Burger_Interaction_MZ.po
#	game/tl/french/Transition.po
#	game/tl/french/battlesetup.po
#	game/tl/french/character customization.po
#	game/tl/french/computer.po
#	game/tl/french/controls.po
#	game/tl/french/cutOut.po
#	game/tl/french/dasirees_service.po
#	game/tl/french/desiree_affection_scenes.po
#	game/tl/french/desiree_cowgirl.po
#	game/tl/french/desiree_repeatable_service.po
#	game/tl/french/episode1_MZ.po
#	game/tl/french/episode2_MZ.po
#	game/tl/french/episode3_MZ.po
#	game/tl/french/episode4_MZ.po
#	game/tl/french/episode5_MZ.po
#	game/tl/french/episode6_MZ.po
#	game/tl/french/episode7_MZ.po
#	game/tl/french/episode8_MZ.po
#	game/tl/french/episode_1_side_quest_Paulina.po
#	game/tl/french/episode_2_pda_side_quest.po
#	game/tl/french/episode_4_cylindrical.po
#	game/tl/french/episode_4_p_phantom.po
#	game/tl/french/episode_4_twinkle_twinkle.po
#	game/tl/french/episode_5_casual_night.po
#	game/tl/french/episodes_selection.po
#	game/tl/french/fight_Dash.po
#	game/tl/french/fight_ghost_bathroom.po
#	game/tl/french/fight_ghosts.po
#	game/tl/french/fight_shadow.po
#	game/tl/french/house_misc.po
#	game/tl/french/jack_training_machine.po
#	game/tl/french/jazz_yoga.po
#	game/tl/french/lancer.po
#	game/tl/french/laundry_room.po
#	game/tl/french/lily_introduction.po
#	game/tl/french/maddie_breakfast.po
#	game/tl/french/maddie_staying_home.po
#	game/tl/french/maddie_tv.po
#	game/tl/french/maddie_x_jack.po
#	game/tl/french/maddie_yoga.po
#	game/tl/french/mall_parking_lot.po
#	game/tl/french/mystery_shop_MZ.po
#	game/tl/french/nasty_burger.po
#	game/tl/french/newbattle.po
#	game/tl/french/options.po
#	game/tl/french/paulina_spookchat.po
#	game/tl/french/pda_screen.po
#	game/tl/french/sam_handjob.po
#	game/tl/french/sam_home.po
#	game/tl/french/sam_spookchat_selfie.po
#	game/tl/french/school_misc.po
#	game/tl/french/school_upstairs_landing.po
#	game/tl/french/screens.po
#	game/tl/french/spookchat_paulina.po
#	game/tl/french/spookchat_sam.po
#	game/tl/french/spookchat_star.po
#	game/tl/french/spookchat_tucker.po
#	game/tl/french/star_gym_running.po
#	game/tl/french/the_bus_stop.po
#	game/tl/french/town_map_1.po
#	game/tl/french/training_machine.po
#	game/tl/french/valerie_nasty_burger_soda_incident.po
#	game/tl/german/9999-battle-label.po
#	game/tl/german/AbYss_MZ.po
#	game/tl/german/Desiree_Dialogue.po
#	game/tl/german/Jack_Dialogue_1_MZ.po
#	game/tl/german/Maddie_Dialogue_1_MZ.po
#	game/tl/german/Nasty_Burger_Interaction_MZ.po
#	game/tl/german/Transition.po
#	game/tl/german/battlesetup.po
#	game/tl/german/character customization.po
#	game/tl/german/computer.po
#	game/tl/german/controls.po
#	game/tl/german/cutOut.po
#	game/tl/german/dasirees_service.po
#	game/tl/german/desiree_affection_scenes.po
#	game/tl/german/desiree_cowgirl.po
#	game/tl/german/desiree_repeatable_service.po
#	game/tl/german/episode1_MZ.po
#	game/tl/german/episode2_MZ.po
#	game/tl/german/episode3_MZ.po
#	game/tl/german/episode4_MZ.po
#	game/tl/german/episode5_MZ.po
#	game/tl/german/episode6_MZ.po
#	game/tl/german/episode7_MZ.po
#	game/tl/german/episode8_MZ.po
#	game/tl/german/episode_1_side_quest_Paulina.po
#	game/tl/german/episode_2_pda_side_quest.po
#	game/tl/german/episode_4_cylindrical.po
#	game/tl/german/episode_4_p_phantom.po
#	game/tl/german/episode_4_twinkle_twinkle.po
#	game/tl/german/episode_5_casual_night.po
#	game/tl/german/episodes_selection.po
#	game/tl/german/fight_Dash.po
#	game/tl/german/fight_ghost_bathroom.po
#	game/tl/german/fight_ghosts.po
#	game/tl/german/fight_shadow.po
#	game/tl/german/house_misc.po
#	game/tl/german/jack_training_machine.po
#	game/tl/german/jazz_yoga.po
#	game/tl/german/lancer.po
#	game/tl/german/laundry_room.po
#	game/tl/german/lily_introduction.po
#	game/tl/german/maddie_breakfast.po
#	game/tl/german/maddie_staying_home.po
#	game/tl/german/maddie_tv.po
#	game/tl/german/maddie_x_jack.po
#	game/tl/german/maddie_yoga.po
#	game/tl/german/mall_parking_lot.po
#	game/tl/german/mystery_shop_MZ.po
#	game/tl/german/nasty_burger.po
#	game/tl/german/newbattle.po
#	game/tl/german/options.po
#	game/tl/german/paulina_spookchat.po
#	game/tl/german/pda_screen.po
#	game/tl/german/sam_handjob.po
#	game/tl/german/sam_home.po
#	game/tl/german/sam_spookchat_selfie.po
#	game/tl/german/school_misc.po
#	game/tl/german/school_upstairs_landing.po
#	game/tl/german/screens.po
#	game/tl/german/spookchat_paulina.po
#	game/tl/german/spookchat_sam.po
#	game/tl/german/spookchat_star.po
#	game/tl/german/spookchat_tucker.po
#	game/tl/german/star_gym_running.po
#	game/tl/german/the_bus_stop.po
#	game/tl/german/town_map_1.po
#	game/tl/german/training_machine.po
#	game/tl/german/valerie_nasty_burger_soda_incident.po

.gitignore

@@ -146,9 +146,15 @@ game/images
 game/gui
 game/music
 game/archive.rpa
-*.rpa
+*.po
+*.zip
+AmityPark.py
+AmityPark.sh
+game/monika.chr
+renpy/*
+*.exe
+ap_log.txt
+*.rpyc
 *.ttf
-*.txt
 *.otf
-*.rpyc
-*.po
+game/script_version.txt