diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee
index becfb5363..ac8f596b7 100644
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@@ -5,7 +5,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     no_mobile: "CodeCombat ei ole suunniteltu mobiililaitteille ja saattaa sisältää virheitä!" # Warning that shows up on mobile devices
     play: "Pelaa" # The big play button that opens up the campaign view.
 #    play_campaign_version: "Play Campaign Version" # Shows up under big play button if you only play /courses
-    old_browser: "Voi ei, selaimesi on liian vanha CodeCombatialle. Pahoittelumme!" # Warning that shows up on really old Firefox/Chrome/Safari
+    old_browser: "Voi ei, selaimesi on liian vanha CodeCombat:ille. Pahoittelumme!" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "Voit toki kokeilla, mutta kohtaat todennäköisesti ongelmia."
     ipad_browser: "Huonot uutiset: CodeCombat ei toimi iPad:in selaimella. Hyvät uutiset: CodeCombat app iPad:ille on pian valmis."
     campaign: "Kamppanja"
@@ -14,16 +14,16 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     for_developers: "Kehittäjille" # Not currently shown on home page.
     or_ipad: "Tai lataa iPad:ille"
 
-#  new_home:
+  new_home:
 #    slogan: "The most engaging game for learning programming."
 #    classroom_edition: "Classroom Edition:"
-#    learn_to_code: "Learn to code:"
-#    teacher: "Teacher"
-#    student: "Student"
-#    play_now: "Play Now"
+    learn_to_code: "Opi koodaamaan:"
+    teacher: "Opettaja"
+    student: "Oppilas"
+    play_now: "Pelaa Nyt"
 #    im_a_teacher: "I'm a Teacher"
 #    im_a_student: "I'm a Student"
-#    learn_more: "Learn more"
+    learn_more: "Lue lisää"
 #    classroom_in_a_box: "A classroom in-a-box for teaching computer science."
 #    codecombat_is: "CodeCombat is a platform <strong>for students</strong> to learn computer science while playing through a real game."
 #    our_courses: "Our courses have been specifically playtested to <strong>excel in the classroom</strong>, even by teachers with little to no prior programming experience."
@@ -63,7 +63,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    get_started_subtitle: "Set up a class, add your students, and monitor their progress as they learn computer science."
 #    request_demo: "Request a Demo"
 #    setup_a_class: "Set Up a Class"
-#    have_an_account: "Have an account?"
+    have_an_account: "Onko sinulla jo käyttäjä?"
 #    logged_in_as: "You are currently logged in as"
 #    view_my_classes: "View my classes"
 #    computer_science: "Computer science courses for all ages"
@@ -102,7 +102,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     blog: "Blogi"
     forum: "Foorumi"
     account: "Tili"
-#    my_account: "My Account"
+    my_account: "Oma Tili"
     profile: "Profiili"
     stats: "Tilastot"
     code: "Koodi"
@@ -112,27 +112,27 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     about: "Tietoja"
     contact: "Ota yhteyttä"
     twitter_follow: "Seuraa"
-#    students: "Students"
+    students: "Oppilaat"
     teachers: "Opettajat"
     careers: "Ura"
 #    facebook: "Facebook"
 #    twitter: "Twitter"
-#    create_a_class: "Create a Class"
-#    other: "Other"
-#    learn_to_code: "Learn to Code!"
+    create_a_class: "Luo luokka"
+    other: "Muu"
+    learn_to_code: "Opi koodaamaan!"
 #    toggle_nav: "Toggle navigation"
-#    jobs: "Jobs"
-#    schools: "Schools"
-#    educator_wiki: "Educator Wiki"
+    jobs: "Työpaikat"
+    schools: "Koulut"
+    educator_wiki: "Opettajan Wiki"
 #    get_involved: "Get Involved"
-#    open_source: "Open source (GitHub)"
-#    support: "Support"
-#    faqs: "FAQs"
-#    help_pref: "Need help? Email"
-#    help_suff: "and we'll get in touch!"
+    open_source: "Avoin lähdekoodi (GitHub)"
+    support: "Tuki"
+    faqs: "UKK"
+    help_pref: "Tarviksetko apua? lähetä viesti"
+    help_suff: "ja me autamme!"
 
   modal:
-#    cancel: "Cancel"
+    cancel: "Peruuta"
     close: "Sulje"
     okay: "Ok"
 
@@ -159,7 +159,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     owned: "Omistettu" # For items you own
     locked: "Lukittu"
     purchasable: "Ostettavissa" # For a hero you unlocked but haven't purchased
-    available: "Saatavissa"
+    available: "Saatavilla"
     skills_granted: "Taidot" # Property documentation details
     heroes: "Sankarit" # Tooltip on hero shop button from /play
     achievements: "Saavutukset" # Tooltip on achievement list button from /play
@@ -243,7 +243,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 
   login:
     sign_up: "Luo Tili"
-#    email_or_username: "Email or username"
+    email_or_username: "Käyttäjätunnus tai sähköposti"
     log_in: "Kirjaudu"
     logging_in: "Kirjaudutaan"
     log_out: "Kirjaudu Ulos"
@@ -256,69 +256,69 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     signup_switch: "Haluatko luoda tilin?"
 
   signup:
-#    create_student_header: "Create Student Account"
-#    create_teacher_header: "Create Teacher Account"
-#    create_individual_header: "Create Individual Account"
-#    create_header: "Create Account"
+    create_student_header: "Luo Oppilaan Tili"
+    create_teacher_header: "Luo Opettajan Tili"
+    create_individual_header: "Luo Yksittäinen Tili"
+    create_header: "Luo Tili"
     email_announcements: "Haluatko ilmoituksia sähköpostiisi" # {change}
     creating: "Luodaan tili..."
-#    create_account: "Create Account"
-    sign_up: "Ilmoittaudu"
+    create_account: "Luo tili"
+    sign_up: "Luo tili"
     log_in: "kirjaudu sisään salasanalla"
     required: "Kirjaudu ensin jotta pääset jatkamaan."
     login_switch: "Onko sinulla jo tili?"
-#    school_name: "School Name and City"
-#    optional: "optional"
+    school_name: "Koulun Nimi ja Kaupunki"
+    optional: "vapaaehtoinen"
 #    school_name_placeholder: "Example High School, Springfield, IL"
-#    connect_with: "Connect with:"
-#    connected_gplus_header: "You've successfully connected with Google+!"
-#    connected_gplus_p: "Finish signing up so you can log in with your Google+ account."
+    connect_with: "Yhdistä:"
+    connected_gplus_header: "Google+ on yhdistetty onnistuneesti!"
+    connected_gplus_p: "Luo tili loppuun kirjautaksesi sisään Google+ käyttäjälläsi."
 #    gplus_exists: "You already have an account associated with Google+!"
-#    connected_facebook_header: "You've successfully connected with Facebook!"
-#    connected_facebook_p: "Finish signing up so you can log in with your Facebook account."
+    connected_facebook_header: "Facebook on yhdistetty onnistuneesti!"
+    connected_facebook_p: "Luo tili loppuun kirjautuaksesi Facebook käyttäjälläsi."
 #    facebook_exists: "You already have an account associated with Facebook!"
-#    hey_students: "Students, enter the class code from your teacher."
-#    birthday: "Birthday"
-#    parent_email_blurb: "We know you can't wait to learn programming &mdash; we're excited too! Your parents will receive an email with further instructions on how to create an account for you. Email {{email_link}} if you have any questions."
-#    classroom_not_found: "No classes exist with this Class Code. Check your spelling or ask your teacher for help."
-#    checking: "Checking..."
-#    account_exists: "This email is already in use:" # {change}
-#    sign_in: "Sign in"
-#    email_good: "Email looks good!"
-#    name_taken: "Username already taken! Try {{suggestedName}}?"
-#    name_available: "Username available!"
-#    name_is_email: "Username may not be an email"
-#    choose_type: "Choose your account type:"
-#    teacher_type_1: "Teach programming using CodeCombat!"
-#    teacher_type_2: "Set up your class"
-#    teacher_type_3: "Access Course Guides"
-#    teacher_type_4: "View student progress"
-#    signup_as_teacher: "Sign up as a Teacher"
-#    student_type_1: "Learn to program while playing an engaging game!"
-#    student_type_2: "Play with your class"
-#    student_type_3: "Compete in arenas"
-#    student_type_4: "Choose your hero!"
-#    student_type_5: "Have your Class Code ready!"
-#    signup_as_student: "Sign up as a Student"
-#    individuals_or_parents: "Individuals & Parents"
-#    individual_type: "For players learning to code outside of a class. Parents should sign up for an account here."
-#    signup_as_individual: "Sign up as an Individual"
-#    enter_class_code: "Enter your Class Code"
-#    enter_birthdate: "Enter your birthdate:"
-#    ask_teacher_1: "Ask your teacher for your Class Code."
-#    ask_teacher_2: "Not part of a class? Create an "
-#    ask_teacher_3: "Individual Account"
-#    ask_teacher_4: " instead."
-#    about_to_join: "You're about to join:"
-#    enter_parent_email: "Enter your parent’s email address:"
-#    parent_email_error: "Something went wrong when trying to send the email. Check the email address and try again."
-#    parent_email_sent: "We’ve sent an email with further instructions on how to create an account. Ask your parent to check their inbox."
-#    account_created: "Account Created!"
-#    confirm_student_blurb: "Write down your information so that you don't forget it. Your teacher can also help you reset your password at any time."
-#    confirm_individual_blurb: "Write down your login information in case you need it later. Verify your email so you can recover your account if you ever forget your password - check your inbox!"
-#    write_this_down: "Write this down:"
-#    start_playing: "Start Playing!"
-#    sso_connected: "Successfully connected with:"
+    hey_students: "Oppilaat, syöttäkää luokkakoodinne jonka saatte opettajalta."
+    birthday: "Syntymäpäivä"
+    parent_email_blurb: "Tiedämme että haluat heti opppia ohjelmoimaan &mdash; me olemme innoissame myös! Vanhempasi saavat ohjeet tilin luomiseen sähköpostiinsa. Lähetä viesti osoitteeseen {{email_link}} jos sinulla on jotain kysyttävää."
+    classroom_not_found: "Luokkia ei löytynyt tuolla koodilla. Tarkista oikeinkirjoitus tai kysy apua opettajaltasi."
+    checking: "Tarikistetaan..."
+    account_exists: "Sähköposti on jo käytössä:" # {change}
+    sign_in: "Kirjaudu sisään"
+    email_good: "Sähköposti toimii!"
+    name_taken: "Nimi on jo käytössä! Miten olisi {{suggestedName}}?"
+    name_available: "Käyttäjänimi saatavilla!"
+    name_is_email: "Käyttäjätunnus ei voi olla sähköpostiosoite"
+    choose_type: "Valitse tilin tyyppi:"
+    teacher_type_1: "Opeta ohjelmoimista CodeCombat:in avulla!"
+    teacher_type_2: "Aseta luokkasi valmiiksi"
+    teacher_type_3: "Pääsy kurssiohjeisiin"
+    teacher_type_4: "Näe oppilaan edistyminen"
+    signup_as_teacher: "Luo Opettajan Tili"
+    student_type_1: "Opi ohjelmoimaan pelatessasi lumoavaa peliä!"
+    student_type_2: "Pelaa luokkasi kanssa"
+    student_type_3: "Taistele areenoilla"
+    student_type_4: "Valitse sankarisi!"
+    student_type_5: "Ota Luokkakoodi valmiiksi!"
+    signup_as_student: "Luo Oppilaan Tili"
+    individuals_or_parents: "Muut"
+    individual_type: "Pelaajille jotka eivät ole luokasssa oppimassa koodaamaan. Vanhempien tulisi luoda tili täällä."
+    signup_as_individual: "Luo Yksittäinen Tili"
+    enter_class_code: "Syötä Luokkakoodisi"
+    enter_birthdate: "Syötä syntymäaikasi:"
+    ask_teacher_1: "Kysy opettajaltasi luokkakoodia."
+    ask_teacher_2: "Etkö ole osa luokka? Luo "
+    ask_teacher_3: "Yksittäinen Tili"
+    ask_teacher_4: " sen sijaan."
+    about_to_join: "Olet liitymässä:"
+    enter_parent_email: "Syötä vanhempasi sähköposti:"
+    parent_email_error: "Jotain meni pieleen sähköpostin lähetyksessä. Tarkista osoite ja koita uudestaan."
+    parent_email_sent: "Lähetimme sähköpostin jossa on ohjeet tilin luomiseen. Pyydä vanhempaasi tarkistamaan sähköpostinsa."
+    account_created: "Tili luotu!"
+    confirm_student_blurb: "Kirjoita ylös tietosi jotta et unohda niitä. Opettajasi voi nollata salasanasi jos unohdat sen."
+    confirm_individual_blurb: "Kirjoita tietosi ylös saatat tarvita niitä myöhemmin. Vahvista sähköpostiosoiteesi, että voit käyttää sitä salasanasi nollaamiseen tarvittaessa!"
+    write_this_down: "Kirjoita tämä ylös:"
+    start_playing: "Aloita pelaaminen!"
+    sso_connected: "Onnistuneesti yhdistetty:"
 
   recover:
     recover_account_title: "Palauta tili"
@@ -390,7 +390,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     subject: "Aihe"
     email: "Sähköposti"
     password: "Salasana"
-#    confirm_password: "Confirm Password"
+    confirm_password: "Vahvista salasana"
     message: "Viesti"
     code: "Koodi"
     ladder: "Liiga"
@@ -409,10 +409,10 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     warrior: "Sotilas"
     ranger: "Vartija"
     wizard: "Velho"
-#    first_name: "First Name"
-#    last_name: "Last Name"
+    first_name: "Etunimi"
+    last_name: "Sukunimi"
 #    last_initial: "Last Initial"
-#    username: "Username"
+    username: "Käyttäjätunnus"
 
   units:
     second: "sekuntti"
@@ -437,7 +437,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     done: "Valmis"
     next_level: "Seuraava taso"
     next_game: "Seuraava peli"
-#    programming_language: "Programming language"
+    programming_language: "Ohjelmointikieli"
     show_menu: "Näytä pelivalikko"
 #    home: "Home" # Not used any more, will be removed soon.
     level: "Taso" # Like "Level: Dungeons of Kithgard"
@@ -459,7 +459,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     victory: "Voitto"
     victory_title_prefix: ""
     victory_title_suffix: " Valmis"
-    victory_sign_up: "Kirjaudu"
+    victory_sign_up: "Luo tili"
     victory_sign_up_poke: "Haluatko tallettaa koodisi? Luo ilmainen tili!"
     victory_rate_the_level: "Kuinka hauska tämä taso oli?"
     victory_return_to_ladder: "Palaa liigaan"
@@ -484,8 +484,8 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     tome_available_spells: "Saatavissa olevat taiat"
     tome_your_skills: "Taitosi"
     tome_current_method: "Vaaditut toimet"
-#    hints: "Hints"
-#    hints_title: "Hint {{number}}"
+    hints: "Vihjeet"
+    hints_title: "Vihje {{number}}"
     code_saved: "Koodi on tallennettu"
     skip_tutorial: "Ohita (esc)"
     keyboard_shortcuts: "Pikanäppäimet"
@@ -558,7 +558,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    tip_life_and_polymorphism: "Open Source is like a totally polymorphic heterogeneous structure: All types are welcome."
 #    tip_mistakes_proof_of_trying: "Mistakes in your code are just proof that you are trying."
 #    tip_adding_orgres: "Rounding up ogres."
-#    tip_sharpening_swords: "Sharpening the swords."
+    tip_sharpening_swords: "Teroitetaan miekkoja."
 #    tip_ratatouille: "You must not let anyone define your limits because of where you come from. Your only limit is your soul. - Gusteau, Ratatouille"
 #    tip_nemo: "When life gets you down, want to know what you've gotta do? Just keep swimming, just keep swimming. - Dory, Finding Nemo"
 #    tip_internet_weather: "Just move to the internet, it's great here. We get to live inside where the weather is always awesome. - John Green"
@@ -577,7 +577,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     guide_video_tutorial: "Video-oppaat"
     guide_tips: "Vinkkejä"
     multiplayer_tab: "Moninpelaaja"
-    auth_tab: "Kirjaudu"
+    auth_tab: "Kirjaudu sisään"
     inventory_caption: "Varusta sankari"
     choose_hero_caption: "Valitse sankari ja kieli"
     save_load_caption: "... ja katso historiaa"
@@ -1851,7 +1851,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     could_not_load: "Virhe ladattaessa tietoja palvelimelta"
     connection_failure: "Yhteysvirhe."
 #    connection_failure_desc: "It doesn’t look like you’re connected to the internet! Check your network connection and then reload this page."
-#    login_required: "Login Required"
+    login_required: "Kirjautuminen vaaditaan"
 #    login_required_desc: "You need to be logged in to access this page."
     unauthorized: "Teidän tulee olla kirjautuneena sisään. Ovatko evästeet sallittuna?"
     forbidden: "Ei käyttöoikeuttta."
@@ -2001,19 +2001,19 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    license: "license"
 #    oreilly: "ebook of your choice"
 
-#  calendar:
-#    year: "Year"
-#    day: "Day"
-#    month: "Month"
-#    january: "January"
-#    february: "February"
-#    march: "March"
-#    april: "April"
-#    may: "May"
-#    june: "June"
-#    july: "July"
-#    august: "August"
-#    september: "September"
-#    october: "October"
-#    november: "November"
-#    december: "December"
+  calendar:
+    year: "Vuosi"
+    day: "Päivä"
+    month: "Kuukausi"
+    january: "Tammikuu"
+    february: "Helmikuu"
+    march: "Maaliskuu"
+    april: "Huhtikuu"
+    may: "Toukokuu"
+    june: "Kesäkuu"
+    july: "Heinäkuu"
+    august: "Elokuu"
+    september: "Syyskuu"
+    october: "Lokakuu"
+    november: "Marraskuu"
+    december: "Joulukuu"