     modified: "Modificado"
     deleted: "Eliminado"
     moved_index: "Indice Movido"
-#    text_diff: "Text Diff"
-#    merge_conflict_with: "MERGE CONFLICT WITH"
+    text_diff: "Diferencias"
+    merge_conflict_with: "MERGE EN CONFLICTO CON"
     no_changes: "Sin Cambios"
 
   guide:

    prompt_body: "¿Quieres obtener más?"
    prompt_button: "Ingresa a la tienda"

#  subscribe:
#    subscribe_title: "Subscribe"
#    levels: "Unlock 17 extra levels! With 5 new ones every week!"
#    heroes: "More powerful heroes!"
#    gems: "3500 bonus gems every month!"
#    items: "Over 250 bonus items!"
#    parents: "For Parents"
#    parents_title: "Your child will learn to code."
#    parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics."
#    parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers."
#    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
#    subscribe_button: "Subscribe Now"
#    stripe_description: "Monthly Subscription"
#    subscription_required_to_play: "You'll need a subscription to play this level."

  choose_hero:
    choose_hero: "Selecciona tu Heroe"
    programming_language: "Lenguaje de Programación"
    programming_language_description: "¿Qué lenguaje de programación deseas usar?"
#    default: "Default"
#    experimental: "Experimental"
    python_blurb: "Simple pero poderoso."
    javascript_blurb: "El lenguaje de la web."
    coffeescript_blurb: "Sintaxsis de JavaScript mejorada."

    employers: "Empleados"
    candidates: "Candidatos"
    candidate_sessions: "Sesiones de Candidato"
    user_remark: "Observación de Usuario"
    user_remarks: "Observaciones de Usuario"
    versions: "Versiones"
    items: "Objetos"
    heroes: "Heroes"
