diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee
index 4e3cc9bde..dd9bd6b29 100644
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@@ -332,36 +332,36 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     tip_extrapolation: "Hi ha dos tipus de persones: aquells que poden extrapolar des de dades incompletes..."
     tip_superpower: "Programar és el que més s'aproxima a un super poder."
     tip_control_destiny: "En un codi obert real tens el dret a controlar el teu propi destí. - Linus Torvalds"
-#    tip_no_code: "No code is faster than no code."
-#    tip_code_never_lies: "Code never lies, comments sometimes do. — Ron Jeffries"
-#    tip_reusable_software: "Before software can be reusable it first has to be usable."
-#    tip_optimization_operator: "Every language has an optimization operator. In most languages that operator is ‘//’"
-#    tip_lines_of_code: "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. — Bill Gates"
-#    tip_source_code: "I want to change the world but they would not give me the source code."
-#    tip_javascript_java: "Java is to JavaScript what Car is to Carpet. - Chris Heilmann"
-#    tip_move_forward: "Whatever you do, keep moving forward. - Martin Luther King Jr."
-#    tip_google: "Have a problem you can't solve? Google it!"
-#    tip_adding_evil: "Adding a pinch of evil."
-#    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-#    tip_open_source_contribute: "You can help CodeCombat improve!"
-#    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
-#    tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus"
-#    tip_strong_opponents: "Even the strongest of opponents always has a weakness. - Itachi Uchiha"
-#    tip_paper_and_pen: "Before you start coding, you can always plan with a sheet of paper and a pen."
-#    tip_solve_then_write: "First, solve the problem. Then, write the code. - John Johnson"
+    tip_no_code: "Cap codi és més ràpid que l'absència de codi."
+    tip_code_never_lies: "El codi mai menteix, els comentaris a vegades. — Ron Jeffries"
+    tip_reusable_software: "Abans que el codi sigui reutilitzable, ha de ser usable."
+    tip_optimization_operator: "Cada llenguatge té un operador d'optimització. En la majoria d'ells és ‘//’"
+    tip_lines_of_code: "Mesurar el progrés d'un codi per les seves línies és com mesurar el progrés d'un avió pel seu pes. — Bill Gates"
+    tip_source_code: "Vull canviar el món, però no em vol donar el seu codi font."
+    tip_javascript_java: "Java és a JavaScript el que un cotxe a una catifa. - Chris Heilmann"
+    tip_move_forward: "Facis el que facis, sempre segueix endavant. - Martin Luther King Jr."
+    tip_google: "Tens un problema que no pots resoldre? Cerca a Google!"
+    tip_adding_evil: "Afegint una mica de maldat."
+    tip_hate_computers: "La raó real per la qual la gent creu que odia els ordinadors és pels programadors pèssims. - Larry Niven"
+    tip_open_source_contribute: "Pots ajudar a millorar CodeCombat!"
+    tip_recurse: "La iteració és humana, la recursivitat és divina. - L. Peter Deutsch"
+    tip_free_your_mind: "T'has de deixar endur, Neo. Por, dubtes, i incredulitat. Allibera la teva ment. - Morpheus"
+    tip_strong_opponents: "Fins i tot el més fort dels oponents té alguna debilitat. - Itachi Uchiha"
+    tip_paper_and_pen: "Abans de començar a programar, sempre has de començar planejant amb paper i boli."
+    tip_solve_then_write: "Primer, resol el problema. Després, escriu el codi. - John Johnson"
 
   game_menu:
     inventory_tab: "Inventari"
     save_load_tab: "Desa/Carrega"
     options_tab: "Opcions"
     guide_tab: "Gui"
-    guide_video_tutorial: "Video Tutorial"
+    guide_video_tutorial: "Vídeo Tutorial"
     guide_tips: "Consells"
     multiplayer_tab: "Multijugador"
     auth_tab: "Dona't d'alta"
     inventory_caption: "Equipa el teu heroi"
     choose_hero_caption: "Tria l'heroi, llenguatge"
-    save_load_caption: "... i veu l'historial"
+    save_load_caption: "... i mira l'historial"
     options_caption: "Edita la configuració"
     guide_caption: "Documents i pistes"
     multiplayer_caption: "Juga amb amics!"
@@ -375,10 +375,10 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     week: "Aquesta Setmana"
     all: "Tots els temps"
     time: "Temps"
-#    damage_taken: "Damage Taken"
-#    damage_dealt: "Damage Dealt"
-    difficulty: "Difficultat"
-#    gold_collected: "Gold Collected"
+    damage_taken: "Mal rebut"
+    damage_dealt: "Mal inflingit"
+    difficulty: "Dificultat"
+    gold_collected: "Or recol·lectat"
 
   inventory:
     equipped_item: "Equipat"
@@ -394,46 +394,46 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 
   buy_gems:
     few_gems: "Algunes gemmes"
-#    pile_gems: "Pile of gems"
+    pile_gems: "Pila de gemmes"
     chest_gems: "Cofre de gemmes"
     purchasing: "Comprant..."
-#    declined: "Your card was declined"
-#    retrying: "Server error, retrying."
-#    prompt_title: "Not Enough Gems"
+    declined: "La teva targeta ha estat rebutjada"
+    retrying: "Error del servidor, intentant de nou."
+    prompt_title: "Gemmes insuficients"
     prompt_body: "En vols més?"
     prompt_button: "Entrar a la botiga"
-#    recovered: "Previous gems purchase recovered. Please refresh the page."
-#    price: "x3500 / mo"
+    recovered: "S'han recuperat les anteriors compres de gemmes. Si us plaus, recarrega al pàgina."
+    price: "x3500 / més"
 
   subscribe:
-#    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
-    feature1: "60+ nivells bàsics a traves de 4 móns" # {change}
-#    feature2: "10 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "80+ bonus levels"
-#    feature4: "<strong>3500 bonus gems</strong> every month!"
-    feature5: "Video tutorials"
-#    feature6: "Premium email support"
-#    feature7: "Private <strong>Clans</strong>"
-    free: "Gratuit"
-#    month: "month"
-#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
+    comparison_blurb: "Afina les teves habilitats amb una subscripció a CodeCombat!"
+    feature1: "Més de 60 nivells bàsics a traves de 4 móns" # {change}
+    feature2: "10 <strong>nous herois</strong> poderosos amb habilitats úniques!"
+    feature3: "Més de 80 nivells bonus"
+    feature4: "<strong>3500 gemmes bonus</strong> cada mes!"
+    feature5: "Vídeo tutorials"
+    feature6: "Suport Premium per correu electrònic"
+    feature7: "Privat <strong>Clans</strong>"
+    free: "Gratuït"
+    month: "mes"
+    must_be_logged: "Necessites identificar-te. Si us plau, crea un compte o identifica't al menú de la part superior."
     subscribe_title: "Subscriu-te"
-#    unsubscribe: "Unsubscribe"
-#    confirm_unsubscribe: "Confirm Unsubscribe"
-#    never_mind: "Never Mind, I Still Love You"
-#    thank_you_months_prefix: "Thank you for supporting us these last"
-#    thank_you_months_suffix: "months."
-#    thank_you: "Thank you for supporting CodeCombat."
-#    sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better."
-#    unsubscribe_feedback_placeholder: "O, what have we done?"
-#    parent_button: "Ask your parent"
-#    parent_email_description: "We'll email them so they can buy you a CodeCombat subscription."
-    parent_email_input_invalid: "Adreça electrònica invalida."
-#    parent_email_input_label: "Parent email address"
-#    parent_email_input_placeholder: "Enter parent email"
+    unsubscribe: "Donar-se de baixa"
+    confirm_unsubscribe: "Confirmar la baixa"
+    never_mind: "No et preocupis, encara t'estimo"
+    thank_you_months_prefix: "Gràcies pel suport donat els últims"
+    thank_you_months_suffix: "mesos."
+    thank_you: "Gràcies per donar suport a CodeCombat."
+    sorry_to_see_you_go: "Llàstima que te'n vagis! Deixa'ns saber què podríem haver fet millor."
+    unsubscribe_feedback_placeholder: "Oh, què hem fet?"
+    parent_button: "Pregunta als teus pares"
+    parent_email_description: "Els escriurem perquè et puguin comprar una subscripció a CodeCombat."
+    parent_email_input_invalid: "Adreça electrònica invàlida."
+    parent_email_input_label: "Correu electrònic dels pares"
+    parent_email_input_placeholder: "Introdueix el correu electrònic dels teus pares"
     parent_email_send: "Envia correu electrònic"
     parent_email_sent: "Correu enviat!"
-#    parent_email_title: "What's your parent's email?"
+    parent_email_title: "Quin és el correu dels teus pares?"
     parents: "Per Pares"
 #    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
 #    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
@@ -1212,12 +1212,12 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    priority: "Priority"
 
   contribute:
-#    page_title: "Contributing"
-#    intro_blurb: "CodeCombat is 100% open source! Hundreds of dedicated players have helped us build the game into what it is today. Join us and write the next chapter in CodeCombat's quest to teach the world to code!"
-#    alert_account_message_intro: "Hey there!"
-#    alert_account_message: "To subscribe for class emails, you'll need to be logged in first."
-#    archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever."
-#    class_attributes: "Class Attributes"
+    page_title: "Contribueix"
+    intro_blurb: "CodeCombat és 100% codi obert! Molts de jugadors dedicats ens han ajudat a construir el joc tal com és avui. Uneix-te i escriu el següent capitol d'aquesta aventura de CodeCombat a ensenyar a programar!"
+    alert_account_message_intro: "Hola!"
+    alert_account_message: "Per subscriure't a alguna classe, necessites estar identificat."
+    archmage_introduction: "Una de les millors parts de construir jocs és que aglutinen coses molt diverses. Gràfics, sons, treballar en temps real, xarxes socials, i per suposat la programació, des del baix nivell d'ús de bases de dades i administració del servidor fins a dissenyar i crear interfícies. Hi ha molt a fer, i si ets un programador amb experiència i amb l'anhel de submergir-te dins CodeCombat, aquesta classe és per tu. Ens encantarà tenir la teva ajuda en el millor joc de programació que hi ha."
+    class_attributes: "Atributs de la classe"
     archmage_attribute_1_pref: "Coneixement en "
 #    archmage_attribute_1_suf: ", or a desire to learn. Most of our code is in this language. If you're a fan of Ruby or Python, you'll feel right at home. It's JavaScript, but with a nicer syntax."
 #    archmage_attribute_2: "Some experience in programming and personal initiative. We'll help you get oriented, but we can't spend much time training you."
@@ -1502,39 +1502,39 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    members: "Members"
 #    users: "Users"
 
-#  concepts:
-#    advanced_strings: "Advanced Strings"
-#    algorithms: "Algorithms"
-#    arguments: "Arguments"
-#    arithmetic: "Arithmetic"
-#    arrays: "Arrays"
-#    basic_syntax: "Basic Syntax"
-#    boolean_logic: "Boolean Logic"
-#    break_statements: "Break Statements"
-#    classes: "Classes"
-#    continue_statements: "Continue Statements"
-#    for_loops: "For Loops"
-#    functions: "Functions"
-#    graphics: "Graphics"
-#    if_statements: "If Statements"
-#    input_handling: "Input Handling"
-#    math_operations: "Math Operations"
-#    object_literals: "Object Literals"
-#    parameters: "Parameters"
-#    strings: "Strings"
-#    variables: "Variables"
-#    vectors: "Vectors"
-#    while_loops: "Loops"
-#    recursion: "Recursion"
+  concepts:
+    advanced_strings: "Cadenes de text avançades (string)"
+    algorithms: "Algorismes"
+    arguments: "Arguments"
+    arithmetic: "Aritmètica"
+    arrays: "Cadenes (array)"
+    basic_syntax: "Sintaxis bàsica"
+    boolean_logic: "Lògica booleana"
+    break_statements: "Declaracions Break"
+    classes: "Classes"
+    continue_statements: "Sentències Continue"
+    for_loops: "Bucles (For)"
+    functions: "Funcions"
+    graphics: "Gràfics"
+    if_statements: "Sentències If"
+    input_handling: "Manipulació de dades d'entrada"
+    math_operations: "Operacions matemàtiques"
+    object_literals: "Objectes Literals"
+    parameters: "Paràmetres"
+    strings: "Strings"
+    variables: "Variables"
+    vectors: "Vectors"
+    while_loops: "Bucles (While)"
+    recursion: "Recursivitat"
 
   delta:
     added: "Afegit"
     modified: "Modificat"
-#    not_modified: "Not Modified"
+    not_modified: "No modificat"
     deleted: "Eliminat"
     moved_index: "Índex desplaçat"
-#    text_diff: "Text Diff"
-#    merge_conflict_with: "MERGE CONFLICT WITH"
+    text_diff: "Diferir text"
+    merge_conflict_with: "Conflicte d'unió amb"
     no_changes: "Sense canvis"
 
   multiplayer: