Merge branch 'master' into production

app/lib/world/names.coffee

@@ -3,6 +3,7 @@ module.exports.thangNames = thangNames =
     # Female
     'Alali'
     'Anabel'
+    'Delma'
     'Dosha'
     'Gurzunn'
     'Hoot'
@@ -22,6 +23,7 @@ module.exports.thangNames = thangNames =
     # Male
     'Blob'
     'Brack'
+    'Cragg'
     'Dobo'
     'Draff'
     'Eugen'
@@ -72,6 +74,7 @@ module.exports.thangNames = thangNames =
     'Pinakin'
     'Rakash'
     'Rasha'
+    'Savatha'
     'Vujii'
     'Wuda'
     'Yetu'
@@ -108,6 +111,7 @@ module.exports.thangNames = thangNames =
   ]
   'Ogre Warlock': [
     # Male
+    'Gronak'
     'Sorgoth'
     'Vax'
     'Vyrryx'
@@ -145,31 +149,14 @@ module.exports.thangNames = thangNames =
     'Ofgar'
     'Randall'
   ]
-  'Raven Pet': [
-    # Animal
-    'Nevermore'
-  ]
-  'Cougar Pet': [
-    # Animal
-    'Kitty'
-  ]
-  'Frog Pet': [
-    # Animal
-    'Bighead'
-    'Bufo'
-    'Bunda'
-    'Dan\'l Webster'
-    'Freddy'
-    'Frogger'
-    'Froggy'
-    'Hypnotoad'
-    'Mr. Toad'
-    'Slippy'
-    'Toada'
-    'Trevor'
-    'Wart'
-    'Wei Qi'
-  ]
+  # Pets only have one name
+  'Raven Pet': ['Nevermore']
+  'Cougar Pet': ['Kitty']
+  'Frog Pet': ['Hypnotoad']
+  'Griffin Pet': ['']
+  'Pugicorn Pet': ['']
+  'Polar Bear Pet': ['']
+  'Wolf Pet': ['']
   'Horse': [
     # Animal
     'Abby'
@@ -606,6 +593,7 @@ module.exports.thangNames = thangNames =
     'Hugo'
     'Ieyasu'
     'Jack'
+    'Jackson'
     'James'
     'Jason'
     'Jax'

app/locale/es-419.coffee

@@ -82,7 +82,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    get_started: "Get Started"
     students: "Estudiantes:"
     join_class: "Unirse a una clase"
-#    role: "Your role:"
+    role: "Su rol:"
     student_count: "Número de estudiantes:"
     start_playing_for_free: "Empieza a jugar gratis!"
     students_and_players: "Estudiantes y Jugadores"
@@ -102,7 +102,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     blog: "Blog"
     forum: "Foro"
     account: "Cuenta"
-#    my_account: "My Account"
+    my_account: "Mi Cuenta"
     profile: "Perfil"
     stats: "Estadísticas"
     code: "Código"
@@ -112,7 +112,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     about: "Acerca"
     contact: "Contacto"
     twitter_follow: "Seguir"
-#    students: "Students"
+    students: "Estudiantes"
     teachers: "Maestros"
     careers: "Carreras"
     facebook: "Facebook"
@@ -125,8 +125,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     schools: "Escuelas"
 #    educator_wiki: "Educator Wiki"
     get_involved: "Participa"
-#    open_source: "Open source (GitHub)"
-#    support: "Support"
+    open_source: "Código Libre (GitHub)"
+    support: "Soporte"
 #    faqs: "FAQs"
     help_pref: "¿Necesitas ayuda? Envianos un correó electronico!"
     help_suff: "y te contactaremos pronto"
@@ -271,7 +271,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    connected_facebook_p: "Finish signing up so you can log in with your Facebook account."
 #    facebook_exists: "You already have an account associated with Facebook!"
 #    hey_students: "Students, enter the class code from your teacher."
-#    birthday: "Birthday"
+    birthday: "Compleaños"
 
   recover:
     recover_account_title: "recuperar cuenta"
@@ -341,7 +341,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     subject: "Asunto"
     email: "Email"
     password: "Contraseña"
-#    confirm_password: "Confirm Password"
+    confirm_password: "Confirme Contraseña"
     message: "Mensaje"
     code: "Código"
     ladder: "Escalera"
@@ -425,7 +425,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     victory_new_item: "Objeto Nuevo"
     victory_viking_code_school: "¡Changos macacos!, el nivel que acabas de pasar era dificil! Si todavía no eres un desarrollador de software, deberías serlo. Acabas de conseguir una aceptación por vía rápida con la Escuela Vikinga de Có, donde tú puedes llevar tus habilidades al siguiente nivel y convertirteen un desarrollador web profesional en 14 semanas."
     victory_become_a_viking: "Conviértete en un Vikingo"
-#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
+#    victory_no_progress_for_teachers: "El progreso no es guardado para maestros. But, you can add a student account to your classroom for yourself."
     guide_title: "Guía"
     tome_cast_button_run: "Ejecutar"
     tome_cast_button_running: "Ejecutando"
@@ -585,7 +585,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     feature5: "Video tutoriales"
     feature6: "Soporte Premium vía email"
     feature7: "<strong>Clan</strong> Privado"
-#    feature8: "<strong>No ads!</strong>"
+    feature8: "<strong>¡Sin publicidad!</strong>"
     free: "Gratis"
     month: "mes"
     must_be_logged: "Debes iniciar sesión primero. Por favor crea una cuenta o inicia sesión desde el menú superior."
@@ -753,7 +753,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     robin_blurb: "Scaffolding"
     josh_title: "Diseñador de Juegos"
     josh_blurb: "El piso es Lava"
-#    phoenix_title: "Software Engineer"
+    phoenix_title: "Ingeniero de Software"
 #    nolan_title: "Territory Manager"
 #    elliot_title: "Partnership Manager"
     retrostyle_title: "Ilustración"
@@ -825,7 +825,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     phone_number: "Teléfono"
     phone_number_help: "¿Dónde podemos contactarte durante el horario de trabajo ?"
 #    primary_role_label: "Your Primary Role"
-#    role_default: "Select Role"
+    role_default: "Seleccione Rol"
 #    primary_role_default: "Select Primary Role"
 #    purchaser_role_default: "Select Purchaser Role"
     tech_coordinator: "Coordinador de tecnología"
@@ -865,7 +865,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    create_account: "Create a Teacher Account"
 #    create_account_subtitle: "Get access to teacher-only tools for using CodeCombat in the classroom.  <strong>Set up a class</strong>, add your students, and <strong>monitor their progress</strong>!"
 #    convert_account_title: "Update to Teacher Account"
-#    not: "Not"
+    not: "No"
 #    setup_a_class: "Set Up a Class"
 
   versions:
@@ -1294,7 +1294,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    class_name: "Class Name"
 #    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
 
-#  teacher:
+  teacher:
 #    teacher_dashboard: "Teacher Dashboard" # Navbar
 #    my_classes: "My Classes"
 #    courses: "Courses"
@@ -1368,8 +1368,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    total_enrolled_students: "Total Enrolled Students"
 #    unenrolled_students: "Unenrolled Students"
 #    add_enrollment_credits: "Add Enrollment Credits"
-#    purchasing: "Purchasing..."
-#    purchased: "Purchased!"
+    purchasing: "Adquiriendo..."
+    purchased: "Adquirido!"
 #    purchase_now: "Purchase Now"
 #    how_to_enroll: "How to Enroll Students"
 #    how_to_enroll_blurb_1: "If a student is not enrolled yet, there will be an \"Enroll\" button next to their course progress in your class."
@@ -1398,7 +1398,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     ambassador_title: "Embajador"
     ambassador_title_description: "(Soporte)"
     ambassador_summary: "Ayuda a responder las preguntas de los usuarios del foro. Nuestros Embajadores representan CodeCombat en todo el mundo."
-#    teacher_title: "Teacher"
+    teacher_title: "Maestro"
 
   editor:
     main_title: "Editor de CodeCombat"
@@ -1711,10 +1711,10 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     you_can2: "comprar un código prepagado"
     you_can3: "que puede ser aplicado a tu propia cuenta o regalado a otros."
 
-#  coppa_deny:
+#   coppa_deny:
 #    text1: "Can’t wait to learn programming?"
 #    text2: "Ask your parents to create an account for you!"
-#    close: "Close Window"
+#    close: "Cerrar ventana"
 
   loading_error:
     could_not_load: "Error cargando del servidor"
@@ -1869,10 +1869,10 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     license: "licencia"
     oreilly: "ebook de su elección"
 
-#  calendar:
-#    year: "Year"
-#    day: "Day"
-#    month: "Month"
+  calendar:
+    year: "Año"
+    day: "Día"
+    month: "Mes"
 #    january: "January"
 #    february: "February"
 #    march: "March"

app/locale/es-ES.coffee

@@ -15,8 +15,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     or_ipad: "O descargalo para iPad"
 
   new_home:
-#    slogan: "The most engaging game for learning programming."
-#    classroom_edition: "Classroom Edition:"
+    slogan: "El juego más atractivo para aprender a programar."
+    classroom_edition: "Edición para aulas:"
     learn_to_code: "Aprende a programar:"
     teacher: "Profesor"
     student: "Alumno"
@@ -31,24 +31,24 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     designed_with: "Diseñado pensando en los profesores"
     real_code: "Real, escribe código"
     from_the_first_level: "desde el primer nivel"
-#    getting_students: "Getting students to typed code as quickly as possible is critical to learning programming syntax and proper structure."
-#    educator_resources: "Educator resources"
-#    course_guides: "and course guides"
-#    teaching_computer_science: "Teaching computer science does not require a costly degree, because we provide tools to support educators of all backgrounds."
+    getting_students: "Involucrar a los alumnos en la programación por sentencias tan rápido como sea posible es fundamental para aprender la sintaxis de la programación con una estructura apropiada."
+    educator_resources: "Recursos para educadores"
+    course_guides: "y guías de cursos"
+    teaching_computer_science: "Enseñar ciencias computación no requiere de un costoso título, porque nosotros proveemos las herramientas para apoyar educadores con cualquier nivel de conocimientos."
     accessible_to: "Accesible para"
     everyone: "todo el mundo"
-#    democratizing: "Democratizing the process of learning coding is at the core of our philosophy. Everyone should be able to learn to code."
-#    forgot_learning: "I think they actually forgot that they were actually learning something."
-#    wanted_to_do: " Coding is something I've always wanted to do, and I never thought I would be able to learn it in school."
-#    why_games: "Why is learning through games important?"
-#    games_reward: "Games reward the productive struggle."
-#    encourage: "Gaming is a medium that encourages interaction, discovery, and trial-and-error. A good game challenges the player to master skills over time, which is the same critical process students go through as they learn."
-#    excel: "Games excel at rewarding"
-#    struggle: "productive struggle"
-#    kind_of_struggle: "the kind of struggle that results in learning that’s engaging and"
-#    motivating: "motivating"
-#    not_tedious: "not tedious."
-#    gaming_is_good: "Studies suggest gaming is good for children’s brains. (it’s true!)"
+    democratizing: "La democratización del proceso de aprendizaje es el nucleo de nuestra filosofía. Todo mundo debe ser capaz de aprender a programar."
+    forgot_learning: "En realidad creo que que ellos olvidaron que en realidad están aprendiendo algo."
+    wanted_to_do: " Programar es algo que siempre he querido hacer, nunca pensé que sería capáz de aprenderlo en la escuela."
+    why_games: "¿Por qué aprender usando juegos es importante?"
+    games_reward: "Los juegos premian el esfuerzo productivo"
+    encourage: "Jugar es un excelente medio que promueve la interacción, descubrimiento, y aprendizaje a través de prueba-error. Un buen juego reta al jugador a dominar habilidades al pasar el tiempo, éste el el mismo proceso critico por el que pasan los estudiantes al aprender."
+    excel: "Los juegos son excelentes premiando"
+    struggle: "el esfuerzo productivo"
+    kind_of_struggle: "el tipo de esfuerzo que resulta en aprendizaje learning que es atractivo y"
+    motivating: "motivante"
+    not_tedious: "no tedioso."
+    gaming_is_good: "Estudios sugieren que el jugar es bueno para el cerebro de los niños. (¡Es verdad!)"
 #    game_based: "When game-based learning systems are"
 #    compared: "compared"
 #    conventional: "against conventional assessment methods, the difference is clear: games are better at helping students retain knowledge, concentrate and"
@@ -61,11 +61,11 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    request_demo_subtitle: "Request a demo and get your students started in less than an hour."
 #    get_started_title: "Set up your class today"
 #    get_started_subtitle: "Set up a class, add your students, and monitor their progress as they learn computer science."
-#    request_demo: "Request a Demo"
+    request_demo: "Pide una demostración"
 #    setup_a_class: "Set Up a Class"
-#    have_an_account: "Have an account?"
+    have_an_account: "¿Tienes una cuenta?"
 #    logged_in_as: "You are currently logged in as"
-#    view_my_classes: "View my classes"
+    view_my_classes: "Ver mis clases"
 #    computer_science: "Computer science courses for all ages"
 #    show_me_lesson_time: "Show me lesson time estimates for:"
 #    curriculum: "Total curriculum hours:"
@@ -905,17 +905,17 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     wrong_password: "Contraseña incorrecta"
     upload_picture: "Sube una imagen"
     delete_this_account: "Eliminar esta cuenta de forma permanente"
-#    reset_progress_tab: "Reset All Progress"
-#    reset_your_progress: "Clear all your progress and start over"
+    reset_progress_tab: "Reestablecer progreso"
+    reset_your_progress: "Elimina tu progreso y empieza de nuevo"
     god_mode: "Modo Dios"
     password_tab: "Contraseña"
     emails_tab: "Correos electrónicos"
     admin: "Admin"
-#    manage_subscription: "Click here to manage your subscription."
+    manage_subscription: "Clic aquí para modificar tu suscripción."
     new_password: "Nueva contraseña"
     new_password_verify: "Verificar"
-    type_in_email: "Introduce tu email para confirmar el borrado de esta cuenta"
-#    type_in_email_progress: "Type in your email to confirm deleting your progress."
+    type_in_email: "Introduce tu correo para confirmar el borrado de esta cuenta"
+    type_in_email_progress: "TypeIntroduce tu correo para confirmar el borrado de tu progreso."
     type_in_password: "Además, introduce tu contraseña."
     email_subscriptions: "Suscripciones de correo electrónico"
     email_subscriptions_none: "Sin suscripciones de correo electrónico."
@@ -1398,7 +1398,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     ambassador_title: "Embajador"
     ambassador_title_description: "(Soporte)"
     ambassador_summary: "Amansa a los usuarios de nuestro foro y guía a aquellos que tengan preguntas. Nuestros Embajadores representan a CodeCombat frente al mundo."
-#    teacher_title: "Teacher"
+    teacher_title: "Profesor"
 
   editor:
     main_title: "Editores de CodeCombat"
@@ -1406,7 +1406,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     thang_title: "Editor de Objetos"
     level_title: "Editor de Niveles"
     achievement_title: "Editor de Logros"
-#    poll_title: "Poll Editor"
+    poll_title: "Editor de Encuestas"
     back: "Volver"
     revert: "Revertir"
     revert_models: "Revertir Modelos"
@@ -1471,7 +1471,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     new_achievement_title: "Crea un nuevo Logro"
     new_achievement_title_login: "Inicia sesión para Crear un Nuevo Logro"
     new_poll_title: "Crear una nueva Encuesta"
-#    new_poll_title_login: "Log In to Create a New Poll"
+    new_poll_title_login: "Inicia sesión para Crear una Nueva Encuesta"
     article_search_title: "Buscar artículos aquí"
     thang_search_title: "Busca tipos de objetos aquí"
     level_search_title: "Buscar niveles aquí"
@@ -1511,7 +1511,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     join_desc_3: ", o encuéntranos en nuestro "
     join_desc_4: "¡y partiremos desde ese punto!"
     join_url_email: "Escríbenos un correo electrónico"
-#    join_url_slack: "public Slack channel"
+    join_url_slack: "canal público de Slack"
     archmage_subscribe_desc: "Recibe correos sobre nuevos anuncios y oportunidades de codificar."
     artisan_introduction_pref: "¡Debemos construir niveles adicionales! La gente clama por más contenido y solo podemos crear unos cuantos. Ahora mismo tu estación de trabajo es el nivel uno; nuestro editor de niveles es apenas usable por sus creadores, así que ten cuidado. Si tienes visiones de campañas que alcanzan el infinito"
     artisan_introduction_suf: ", entonces esta Clase es ideal para ti."
@@ -1554,8 +1554,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     ambassador_join_desc: "cuéntanos más sobre ti, que has hecho y qué estarías interesado en hacer. ¡Y continuaremos a partir de ahí!"
     ambassador_join_note_strong: "Nota"
     ambassador_join_note_desc: "Una de nuestras principales prioridades es construir un modo multijugador donde los jugadores con mayores dificultades a la hora de resolver un nivel, puedan invocar a los magos más avanzados para que les ayuden. Será una buena manera de que los Embajadores puedan hacer su trabajo. ¡Te mantendremos informado!"
-    ambassador_subscribe_desc: "Recibe correos sobre actualizaciones de soporte y desarrollo del multijugador."
-#    teacher_subscribe_desc: "Get emails on updates and announcements for teachers."
+    ambassador_subscribe_desc: "Recibe correos acerca de actualizaciones de soporte y desarrollo del multijugador."
+    teacher_subscribe_desc: "Recibe acerca de  actualizaciones y anuncios para profesores."
     changes_auto_save: "Los cambios son guardados automáticamente cuando marcas las casillas de verificación."
     diligent_scribes: "Nuestros diligentes Escribas:"
     powerful_archmages: "Nuestros poderosos Archimagos:"
@@ -1610,7 +1610,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     fight: "¡Pelea!"
     watch_victory: "Ver tu victoria"
     defeat_the: "Vence a"
-#    watch_battle: "Watch the battle"
+    watch_battle: "Observa la batalla"
     tournament_started: ", iniciado"
     tournament_ends: "El torneo termina"
     tournament_ended: "El torneo ha terminado"
@@ -1659,7 +1659,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 
   account:
     payments: "Pagos"
-#    prepaid_codes: "Prepaid Codes"
+    prepaid_codes: "Código prepagados"
     purchased: "Adquirido"
     subscription: "Suscripción"
     invoices: "Facturas"
@@ -1711,10 +1711,10 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    you_can2: "purchase a prepaid code"
 #    you_can3: "that can be applied to your own account or given to others."
 
-#  coppa_deny:
-#    text1: "Can’t wait to learn programming?"
-#    text2: "Ask your parents to create an account for you!"
-#    close: "Close Window"
+  coppa_deny:
+    text1: "¿No puedes esperar para empezar a programar?"
+    text2: "¡Pide a tus padres que hagan una cuenta para ti!"
+    close: "Cerrar ventana"
 
   loading_error:
     could_not_load: "Error al cargar desde el servidor."
@@ -1860,7 +1860,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     prizes: "Premios"
     total_value: "Valor Total"
     in_cash: "en dinero"
-    custom_wizard: "Personaliza tu Mago de CodeCombat"
+    custom_wizard: "Personaliza tu Hechicero de CodeCombat"
     custom_avatar: "Personaliza tu avatar de CoceCombat"
     heap: "Por seis meses de acceso \"Startup\""
     credits: "creditos"
@@ -1869,19 +1869,19 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     license: "licencia"
     oreilly: "ebook de tu eleccion"
 
-#  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: "Año"
+    day: "Día"
+    month: "Mes"
+    january: "Enero"
+    february: "Febrero"
+    march: "Marzo"
+    april: "Abril"
+    may: "Mayo"
+    june: "Junio"
+    july: "Julio"
+    august: "Agosto"
+    september: "Septiembre"
+    october: "Octubre"
+    november: "Noviembre"
+    december: "Diciembre"

app/locale/fr.coffee

@@ -102,7 +102,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     blog: "Blog"
     forum: "Forum"
     account: "Compte"
-#    my_account: "My Account"
+    my_account: "Mon compte"
     profile: "Profil"
     stats: "Stats"
     code: "Code"
@@ -112,24 +112,24 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     about: "À propos"
     contact: "Contact"
     twitter_follow: "Suivre"
-#    students: "Students"
+    students: "Étudiants"
     teachers: "Enseignants"
     careers: "Emplois"
-#    facebook: "Facebook"
-#    twitter: "Twitter"
-#    create_a_class: "Create a Class"
-#    other: "Other"
-#    learn_to_code: "Learn to Code!"
-#    toggle_nav: "Toggle navigation"
-#    jobs: "Jobs"
-#    schools: "Schools"
-#    educator_wiki: "Educator 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!"
+    facebook: "Facebook"
+    twitter: "Twitter"
+    create_a_class: "Créer une classe"
+    other: "Autre"
+    learn_to_code: "Apprenez à programmer!"
+    toggle_nav: "Basculer la navigation"
+    jobs: "Emplois"
+    schools: "Écoles"
+    educator_wiki: "Wiki pour les éducateurs"
+    get_involved: "Devenez impliqué"
+    open_source: "Code libre (GitHub)"
+    support: "Support"
+    faqs: "FAQs"
+    help_pref: "Besoin d'aide? Email"
+    help_suff: "et nous entrerons en contact!"
 
   modal:
     close: "Fermer"
@@ -182,55 +182,55 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     campaign_old_multiplayer: "(Obsolète) Ancienne arènes multijoueurs"
     campaign_old_multiplayer_description: "Reliques d'un âge plus civilisé. Il n'y a aucune simulation pour ces vielles arènes multijoueur vides de tout héros."
 
-#  code:
+  code:
 #    if: "if" # Keywords--these translations show up on hover, so please translate them all, even if it's kind of long. (In the code editor, they will still be in English.)
-#    else: "else"
-#    elif: "else if"
-#    while: "while"
-#    loop: "loop"
-#    for: "for"
-#    break: "break"
-#    continue: "continue"
-#    pass: "pass"
-#    return: "return"
-#    then: "then"
-#    do: "do"
-#    end: "end"
-#    function: "function"
-#    def: "define"
-#    var: "variable"
-#    self: "self"
-#    hero: "hero"
-#    this: "this"
-#    or: "or"
-#    "||": "or"
-#    and: "and"
-#    "&&": "and"
-#    not: "not"
-#    "!": "not"
-#    "=": "assign"
-#    "==": "equals"
-#    "===": "strictly equals"
-#    "!=": "does not equal"
-#    "!==": "does not strictly equal"
-#    ">": "is greater than"
-#    ">=": "is greater than or equal"
-#    "<": "is less than"
-#    "<=": "is less than or equal"
-#    "*": "multiplied by"
-#    "/": "divided by"
-#    "+": "plus"
-#    "-": "minus"
-#    "+=": "add and assign"
-#    "-=": "subtract and assign"
-#    True: "True"
-#    true: "true"
-#    False: "False"
-#    false: "false"
-#    undefined: "undefined"
-#    null: "null"
-#    nil: "nil"
-#    None: "None"
+    else: "Sinon"
+    elif: "et sinon"
+    while: "tant que"
+    loop: "boucle"
+    for: "pour"
+    break: "break"
+    continue: "continue"
+    pass: "passe"
+    return: "retourne"
+    then: "alors"
+    do: "fait"
+    end: "fin"
+    function: "fonction"
+    def: "definit"
+    var: "variable"
+    self: "soi-même"
+    hero: "héros"
+    this: "ceci"
+    or: "or"
+    "||": "ou"
+    and: "et"
+    "&&": "et"
+    not: "n'est pas"
+    "!": "n'est pas"
+    "=": "assigner"
+    "==": "équivalent à"
+    "===": "strictement équivalent à"
+    "!=": "n'est pas équivalent à"
+    "!==": "n'est pas strictement équivalent à"
+    ">": "est plus grand que"
+    ">=": "est plus grand que ou équivalent à"
+    "<": "is less than"
+    "<=": "est plus petit ou  équivalent à"
+    "*": "multiplié par"
+    "/": "divisé par"
+    "+": "plus"
+    "-": "moins"
+    "+=": "ajoute et assigne"
+    "-=": "soustrait et assigne"
+    True: "Vrai"
+    true: "vrai"
+    False: "Faux"
+    false: "faux"
+    undefined: "non défini"
+    null: "nul"
+    nil: "nil"
+    None: "Aucune valeur"
 
   share_progress_modal:
     blurb: "Vous faites beaucoup de progrès ! Partagez ce que vous avez appris grâce à CodeCombat avec vos amis !" # {change}
@@ -263,15 +263,15 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     school_name: "Nom et ville de votre école"
     optional: "facultatif"
     school_name_placeholder: "Exemple : Lycée Champollion, Figeac"
-#    or_sign_up_with: "or sign up 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."
-#    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."
-#    facebook_exists: "You already have an account associated with Facebook!"
-#    hey_students: "Students, enter the class code from your teacher."
-#    birthday: "Birthday"
+    or_sign_up_with: "ou abonnez-vous avec"
+    connected_gplus_header: "Vous avez réussi à vous connecter avec votre compte Google+!"
+    connected_gplus_p: "Finissez de vous abonnez pour pouvoir vous connecter avec votre compte Google+."
+    gplus_exists: "Vous avez déjà un compte associé à Google+!"
+    connected_facebook_header: "Vous avez réussi à vous connecter avec votre compte Facebook!"
+    connected_facebook_p: "Finissez de vous abonnez pour pouvoir vous connecter avec votre compte Facebook."
+    facebook_exists: "Vous avez réussi à vous connecter avec votre compte Facebook!"
+    hey_students: "Étudiants, entrez le code de cours de votre enseignant."
+    birthday: "Anniversaire"
 
   recover:
     recover_account_title: "Récupérer son compte"
@@ -308,7 +308,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     submit_patch: "Soumettre un correctif"
     submit_changes: "Soumettre des Changements"
     save_changes: "Sauvegarder les modifications"
-#    required_field: "Required field"
+    required_field: "Champ requis"
 
   general:
     and: "et"
@@ -341,7 +341,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     subject: "Sujet"
     email: "E-mail"
     password: "Mot de passe"
-#    confirm_password: "Confirm Password"
+    confirm_password: "Confirmez votre mot de passe"
     message: "Message"
     code: "Code"
     ladder: "Companion"
@@ -360,9 +360,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     warrior: "Guerrier"
     ranger: "Ranger"
     wizard: "Magicien"
-#    first_name: "First Name"
-#    last_name: "Last Name"
-#    username: "Username"
+    first_name: "Prénom"
+    last_name: "Nom de famille"
+    username: "Nom d'utilisateur"
 
   units:
     second: "seconde"
@@ -381,7 +381,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     years: "années"
 
   play_level:
-#    level_complete: "Level Complete"
+    level_complete: "Niveau complété"
     completed_level: "Niveau terminé:"
     course: "Cours:"
     done: "Fait"
@@ -425,7 +425,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     victory_new_item: "Nouvel item"
     victory_viking_code_school: "Par la barbe d'Odin, c'est un niveau difficile que tu viens de compléter! Si tu n'est pas un développeur de logiciel, tu devrais l'être ! Ceci vient de te propulser dans l'école de Code Vikings où tu pourras amener tes habilités au prochain niveau et devenir un développer web profesionnel en deux semaines."
     victory_become_a_viking: "Devenez un viking"
-#    victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."
+    victory_no_progress_for_teachers: "La progression n'est pas sauvegardé pour les enseignants. Mais vous pouvez ajouter un compte étudiant à votre salle de cours pour vous."
     guide_title: "Guide"
     tome_cast_button_run: "Exécuter"
     tome_cast_button_running: "En cours d'exécution"
@@ -505,15 +505,15 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tip_strong_opponents: "Même les ennemis les plus puissant ont une faiblesse. - Itachi Uchiha"
     tip_paper_and_pen: "Avant de commencer à coder, vous pouvez plannifier les choses sur papier."
     tip_solve_then_write: "D'abord, résolvez le problème. Ensuite, écrivez le code. - John Johnson"
-#    tip_compiler_ignores_comments: "Sometimes I think that the compiler ignores my comments."
-#    tip_understand_recursion: "The only way to understand recursion is to understand recursion."
-#    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_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"
+    tip_compiler_ignores_comments: "Des fois, je pense que le compilateur ignore mes commentaires."
+    tip_understand_recursion: "La seule manière de comprendre la récursion est de comprendre la récursion."
+    tip_life_and_polymorphism: "Le code libre est une structure hétérogène polymorphique. Tous les types sont les bienvenues."
+    tip_mistakes_proof_of_trying: "Les erreurs dans votre code sont la preuve que vous essayez."
+    tip_adding_orgres: "Rassembler les ogres."
+    tip_sharpening_swords: "Aiguiser les épées."
+    tip_ratatouille: "Tu ne dois laisser personne définir où se trouvent tes limites. La seule vraie limite est c'est ton âme. - Gusteau, Ratatouille"
+    tip_nemo: "Quand la vie vous rabaisse, vous savez ce que vous devenez faire ? Juste continuer de nager, juste continuer de nager. - 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"
 #    tip_nerds: "Nerds are allowed to love stuff, like jump-up-and-down-in-the-chair-can't-control-yourself love it. - John Green"
 #    tip_self_taught: "I taught myself 90% of what I've learned. And that's normal! - Hank Green"
 #    tip_luna_lovegood: "Don't worry, you're just as sane as I am. - Luna Lovegood"
@@ -1689,27 +1689,27 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     retrying: "Erreur interne, réessayez"
     success: "Paiement accepté, merci !"
 
-#  account_prepaid:
-#    purchase_code: "Purchase a Subscription Code"
-#    purchase_code1: "Subscription Codes can be redeemed to add premium subscription time to one or more CodeCombat accounts."
+  account_prepaid:
+    purchase_code: "Acheter un code d'abonnement"
+    purchase_code1: "Les codes d'abonnement peuvent seulement être racheter pour ajouter des comptes prenium à un ou plusieurs comptes de CodeCombat"
 #    purchase_code2: "Each CodeCombat account can only redeem a particular Subscription Code once."
 #    purchase_code3: "Subscription Code months will be added to the end of any existing subscription on the account."
-#    users: "Users"
-#    months: "Months"
-#    purchase_total: "Total"
+    users: "Utilisateurs"
+    months: "Mois"
+    purchase_total: "Total"
 #    purchase_button: "Submit Purchase"
-#    your_codes: "Your Codes"
+    your_codes: "Vos codes"
 #    redeem_codes: "Redeem a Subscription Code"
 #    prepaid_code: "Prepaid Code"
 #    lookup_code: "Lookup prepaid code"
 #    apply_account: "Apply to your account"
 #    copy_link: "You can copy the code's link and send it to someone."
-#    quantity: "Quantity"
+    quantity: "Quantité"
 #    redeemed: "Redeemed"
-#    no_codes: "No codes yet!"
-#    you_can1: "You can"
-#    you_can2: "purchase a prepaid code"
-#    you_can3: "that can be applied to your own account or given to others."
+    no_codes: "Pas de code soumis"
+    you_can1: "Vous pouvez"
+    you_can2: "achetez un code pré-payé"
+    you_can3: "qui pourra être appliqué à votre compte ou donné à un autre."
 
 #  coppa_deny:
 #    text1: "Can’t wait to learn programming?"
@@ -1869,19 +1869,19 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     license: "Licence"
     oreilly: "ebook de votre choix"
 
-#  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: "Année"
+    day: "Jour"
+    month: "Mois"
+    january: "Janvier"
+    february: "Février"
+    march: "Mars"
+    april: "Avril"
+    may: "Mai"
+    june: "Juin"
+    july: "Juillet"
+    august: "Août"
+    september: "Septembre"
+    october: "Octobre"
+    november: "Novembre"
+    december: "Décembre"

app/locale/nl-NL.coffee

@@ -818,51 +818,51 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     more_info_3: "Het is een goede plek om contact te leggen met andere leerkrachten, die CodeCombat gebruiken."
 
   teachers_quote:
-    name: "Offerte Formulier" # {change}
-    title: "Offerte aanvragen" # {change}
-    subtitle: "Haal CodeCombat jouw klaslokaal, club, school of wijk in!"
+    name: "Demo Formulier" 
+    title: "Demo aanvragen"
+    subtitle: "Haal CodeCombat jouw klaslokaal of club!"
     email_exists: "Er bestaat al een gebruiker met dit email adres."
     phone_number: "Telefoonnummer"
-    phone_number_help: "Waar kunnen we je bereiken tijdens de werkdag?"
-    primary_role_label: "Uw Primaire Rol"
-    role_default: "Selecteer Rol"
-    primary_role_default: "Selecteer Primaire Rol"
-    purchaser_role_default: "Selecteer Aanschaf Rol"
+    phone_number_help: "Waarop kunnen we je bereiken tijdens kantooruren?"
+    primary_role_label: "Uw primaire rol"
+    role_default: "Selecteer primaire rol"
+    primary_role_default: "Selecteer rol"
+    purchaser_role_default: "Selecteer rol in besluitvorming"
     tech_coordinator: "IT coördinator"
     advisor: "Adviseur"
     principal: "Schoolhoofd"
     superintendent: "Leidinggevende"
     parent: "Ouder/verzorger"
-    purchaser_role_label: "Uw aanschaf Rol"
+    purchaser_role_label: "Uw rol in besluitvorming"
     influence_advocate: "Promoten"
     evaluate_recommend: "Evalueren/Aanbevelen"
     approve_funds: "Budget toewijzen"
-    no_purchaser_role: "Geen rol in aanschaf keuze"
+    no_purchaser_role: "Geen rol in besluitvorming"
     organization_label: "Schoolnaam"
     city: "Stad"
     state: "Provincie"
     country: "Land"
-    num_students_help: "Hoeveel leerlingen verwacht u in te schrijven voor CodeCombat?"
+    num_students_help: "Voor hoeveel leerlingen zou je CodeCombat willen gebruiken?"
     num_students_default: "Selecteer bereik"
-    education_level_label: "Opleidingsniveau van de leerlingen"
-    education_level_help: "Kies hoeveel van toepassing is."
+    education_level_label: "Opleidingsniveau van leerlingen"
+    education_level_help: "Selecteer toepasbare niveau(s)."
     elementary_school: "Basisschool"
-    high_school: "Middelbare school"
-    please_explain: "(licht a.u.b. toe)"
-    middle_school: "Brugklas"
+    high_school: "Middelbare school (bovenbouw)"
+    please_explain: "(licht toe a.u.b.)"
+    middle_school: "Middelbare school (onderbouw)"
     college_plus: "Hoger Onderwijs"
     anything_else: "Is er verder nog iets dat we moeten weten?"
-    thanks_header: "Bedankt voor het aanvragen van een citaat!" # {change}
-    thanks_sub_header: "Bedankt voor je interesse in CodeCombat voor jouw school."
+    thanks_header: "Bedankt voor je demo-aanvraag!"
+    thanks_sub_header: "Bedankt voor je interesse in CodeCombat."
     thanks_p: "Wij zullen spoedig contact met u opnemen. Vragen? Mail ons:" # {change}
-#    back_to_classes: "Back to Classes"
-    finish_signup: "Voltooi aanmaken van jouw docenten-account:"
+    back_to_classes: "Terug naar Klassen"
+    finish_signup: "Voltooi je docenten-account:"
     finish_signup_p: "Maak een account om een klas op te zetten, voeg leerlingen toe en bekijk hun voortgang terwijl ze leren programmeren"
     signup_with: "Schrijf je in met:"
     connect_with: "Koppel met:"
-    conversion_warning: "WAARSCHUWING: Je huidige account is een <em>Leerling Account</em>. Wanneer je dit formulier indient zal dit account gewijzigt worden naar een Docenten Account."
-    learn_more_modal: "Docenten Accounts op CodeCombat hebben de mogelijkheid om de voortgang van studenten te bekijken, inschrijvingen regelen en klaslokalen beheren. Docenten Accounts kunnen niet in een klaslokaal ingeschreven staan - als je ingeschreven staat in een klas met dit account zul je niet langer toegang hebben tot die klas wanneer je jouw account veranderd in een Docenten Account."
-    create_account: "Maak een docenten-account"
+    conversion_warning: "WAARSCHUWING: Je huidige account is een <em>Leerling Account</em>. Wanneer je dit formulier indient zal dit account worden omgezet naar een Docenten Account."
+    learn_more_modal: "Docenten Accounts kunnen de voortgang van leerlingen te zien, inschrijvingen regelen en klaslokalen beheren. Docenten Accounts kunnen niet in een klaslokaal ingeschreven staan - als je ingeschreven staat in een klas met dit account zul je niet langer als leerling toegang hebben tot die klas."
+    create_account: "Maak een docenten-account aan"
     create_account_subtitle: "Krijg toegang tot exclusieve hulpmiddelen voor docenten door CodeCombat in de klas te gebruiken. <strong>Maak een klas aan</strong>, voeg leerlingen toe, en <strong>bekijk hun vooruitgang</strong>!"
     convert_account_title: "Verander in een docenten-account"
     not: "niet"
@@ -871,7 +871,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
   versions:
     save_version_title: "Nieuwe versie opslaan"
     new_major_version: "Nieuwe hoofdversie"
-    submitting_patch: "Aanpassing wordt Ingediend..."
+    submitting_patch: "Aanpassing wordt ingediend..."
     cla_prefix: "Om bewerkingen op te slaan, moet je eerst akkoord gaan met onze"
     cla_url: "CLA"
     cla_suffix: "."
@@ -1069,10 +1069,10 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     completed: "voltooid:"
     invite_students: "Nodig leerlingen uit voor deze klas."
     invite_link_header: "Link om aan cursus deel te nemen"
-    invite_link_p_1: "Geef deze link aan leerlingen waarvan u wilt dat zij de cursus volgen."
+    invite_link_p_1: "Geef deze link aan leerlingen waarvan je wil dat zij de cursus volgen."
     invite_link_p_2: "Of laat ons hun direct een e-mail sturen:"
-    capacity_used: "Cursus stoelen gebruikt:"
-    enter_emails: "Voer e-mailadressen van leerlingen in om uit te nodigen, één per regel"
+    capacity_used: "Cursusplekken gebruikt:"
+    enter_emails: "Voer e-mailadressen van leerlingen in om hen uit te nodigen, één per regel"
     send_invites: "Verstuur uitnodigingen"
     creating_class: "Aanmaken klas..."
     purchasing_course: "Aanschaffen cursus..."
@@ -1080,7 +1080,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     buy_course1: "Koop deze cursus"
     select_all_courses: "Selecteer 'Alle cursussen' voor 50% korting!"
     all_courses: "Alle cursussen"
-    number_programming_students: "Aantal informatica leerlingen"
+    number_programming_students: "Aantal doelgroepleerlingen"
     number_total_students: "Totaal aan leerlingen op school"
     enter_number_students: "Voer het aantal leerlingen in dat je voor de klas nodig hebt."
     name_class: "Geef je klas een naam"
@@ -1089,25 +1089,25 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     purchasing_for: "U koopt een licentie voor"
     creating_for: "U maakt een klas voor"
     for: "voor" # Like in 'for 30 students'
-    receive_code: "Naderhand ontvangt u een ontgrendelcode om uw leerlingen, waarmee zij zich kunnen inschrijven in uw klas."
+    receive_code: "Naderhand ontvangt u een ontgrendelcode vooor uw leerlingen, waarmee zij zich kunnen inschrijven in uw klas."
     free_trial: "Gratis uitproberen voor leerkrachten!"
     get_access: "Individueel toegang krijgen voor evaluatiedoeleinden."
     questions: "Vragen?"
     teachers_click: "Leerkrachten klik hier"
     students_click: "Leerlingen klik hier"
     courses_on_coco: "Cursussen van CodeCombat"
-    designed_to: "Cursussen zijn ontwikkeld ter introductie van ICT-concepten met CodeCombats leuke en leerzame omgevingen. CodeCombat-levels zijn gesturctureerd rond belangrijke concepten om vooruitstrevend leren te bemoedigen, gedurende 5 uur."
+    designed_to: "Cursussen zijn ontwikkeld ter introductie van ICT-concepten met CodeCombat's leuke en leerzame omgevingen. CodeCombat-levels zijn gesturctureerd rond belangrijke concepten om vooruitstrevend leren te stimuleren, gedurende 5 uur."
     more_in_less: "Leer meer in minder tijd"
     no_experience: "Geen programmeerervaring nodig"
     easy_monitor: "voortgang leerlingen gemakkelijk te bekijken"
-    purchase_for_class: "Koop een cursus voor de hele klas. Het is makkelijk je leerlingen in te schrijven!"
+    purchase_for_class: "Koop een cursus voor de hele klas. Schrijf je leerlingen eenvoudig in!"
     see_the: "Bekijk de"
     more_info: "voor meer informatie."
     choose_course: "Kies uw cursus:"
     enter_code: "voer een ontgrendelcode in" # {change}
     enter_code1: "Voer ontgrendelcode in"
     enroll: "Inschrijven"
-    pick_from_classes: "Kies uit je huidige klas"
+    pick_from_classes: "Kies uit je huidige klassen"
     enter: "Treed toe"
     or: "Of"
     topics: "Onderwerpen"
@@ -1233,10 +1233,10 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     getting_started_3: "Je ziet dan de voortgang van de leerlingen, wanneer ze zich inschrijven en aanmelden voor uw klas."
     additional_resources: "Extra bronnen"
     additional_resources_1_pref: "Download/print onze"
-    additional_resources_1_mid: "Cursus 1 Leerkrachtengids" # {change}
+    additional_resources_1_mid: "Cursus 1 docentenhandleiding"
     additional_resources_1_mid2: "en"
     additional_resources_1_mid3: "Cursus 2"
-    additional_resources_1_suff: "uitleg en oplossingen voor elke level." # {change}
+    additional_resources_1_suff: "uitleg en oplossingen voor elk level."
     additional_resources_2_pref: "Maak onze af"
     additional_resources_2_suff: "Om twee gratis inschrijvingen te krijgen voor onze overige betaalde cursussen."
     additional_resources_3_pref: "Bezoek onze"
@@ -1601,7 +1601,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     tutorial_skip: "Sla Tutorial over"
     tutorial_not_sure: "Niet zeker wat er aan de hand is?"
     tutorial_play_first: "Speel eerst de Tutorial."
-    simple_ai: "Simpele AI" # {change}
+    simple_ai: "Simpele K.I."
     warmup: "Opwarming"
     friends_playing: "Spelende Vrienden"
     log_in_for_friends: "Log in om met je vrienden te spelen!"
@@ -1623,8 +1623,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     rules: "Regels"
     winners: "Winnaars"
     league: "Competitie"
-    red_ai: "KI rood" # "Red AI Wins", at end of multiplayer match playback
-    blue_ai: "KI blauw" # {change}
+    red_ai: "K.I. rood" # "Red AI Wins", at end of multiplayer match playback
+    blue_ai: "K.I. blauw"
     wins: "Wint" # At end of multiplayer match playback
     humans: "Rood" # Ladder page display team name
     ogres: "Blauw"
@@ -1698,7 +1698,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     months: "Maanden"
     purchase_total: "Totaal"
     purchase_button: "Verzend betaling"
-    your_codes: "Je codes:" # {change}
+    your_codes: "Jouw codes:"
     redeem_codes: "Prepaidcode inwisselen"
     prepaid_code: "Prepaidcode"
     lookup_code: "Prepaidcode opzoeken"

app/locale/pt-BR.coffee

@@ -182,55 +182,55 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     campaign_old_multiplayer: "(Depreciado) Velhas Arenas Multijogador"
     campaign_old_multiplayer_description: "Reliquias de uma era mais civilizada.Nenhuma simulação roda nessa antiguidade ,arenas multijogador sem heróis."
 
-#  code:
-#    if: "if" # Keywords--these translations show up on hover, so please translate them all, even if it's kind of long. (In the code editor, they will still be in English.)
-#    else: "else"
-#    elif: "else if"
-#    while: "while"
-#    loop: "loop"
-#    for: "for"
-#    break: "break"
-#    continue: "continue"
-#    pass: "pass"
-#    return: "return"
-#    then: "then"
-#    do: "do"
-#    end: "end"
-#    function: "function"
-#    def: "define"
-#    var: "variable"
-#    self: "self"
-#    hero: "hero"
-#    this: "this"
-#    or: "or"
-#    "||": "or"
-#    and: "and"
-#    "&&": "and"
-#    not: "not"
-#    "!": "not"
-#    "=": "assign"
-#    "==": "equals"
-#    "===": "strictly equals"
-#    "!=": "does not equal"
-#    "!==": "does not strictly equal"
-#    ">": "is greater than"
-#    ">=": "is greater than or equal"
-#    "<": "is less than"
-#    "<=": "is less than or equal"
-#    "*": "multiplied by"
-#    "/": "divided by"
-#    "+": "plus"
-#    "-": "minus"
-#    "+=": "add and assign"
-#    "-=": "subtract and assign"
-#    True: "True"
-#    true: "true"
-#    False: "False"
-#    false: "false"
-#    undefined: "undefined"
-#    null: "null"
-#    nil: "nil"
-#    None: "None"
+  code:
+    if: "se" # Keywords--these translations show up on hover, so please translate them all, even if it's kind of long. (In the code editor, they will still be in English.)
+    else: "senão"
+    elif: "senão se"
+    while: "enquanto"
+    loop: "repetir"
+    for: "para"
+    break: "parar"
+    continue: "continuar"
+    pass: "passar"
+    return: "devolver"
+    then: "então"
+    do: "fazer"
+    end: "fim"
+    function: "função"
+    def: "definir"
+    var: "variável"
+    self: "próprio"
+    hero: "herói"
+    this: "isto"
+    or: "ou"
+    "||": "ou"
+    and: "e"
+    "&&": "e"
+    not: "não"
+    "!": "não"
+    "=": "atribuir"
+    "==": "é igual a"
+    "===": "é estritamente igual a"
+    "!=": "não é igual a"
+    "!==": "não é estritamente igual a"
+    ">": "é maior do que"
+    ">=": "é maior do que ou igual a"
+    "<": "é menor do que"
+    "<=": "é menor do que ou igual a"
+    "*": "multiplicado por"
+    "/": "dividido por"
+    "+": "mais"
+    "-": "menos"
+    "+=": "adicionar e atribuir"
+    "-=": "subtrair e atribuir"
+    True: "Verdadeiro"
+    true: "verdadeiro"
+    False: "Falso"
+    false: "falso"
+    undefined: "não definido"
+    null: "nulo"
+    nil: "nada"
+    None: "Nenhum"
 
   share_progress_modal:
     blurb: "Você está fazendo bastante progresso! Compartilhe com alguém o quanto você já aprendeu com o CodeCombat!" # {change}

app/locale/pt-PT.coffee

@@ -187,7 +187,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     else: "senão"
     elif: "senão se"
     while: "enquanto"
-    loop: "circular"
+    loop: "repetir"
     for: "para"
     break: "parar"
     continue: "continuar"

app/locale/sr.coffee

@@ -297,7 +297,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     save: "Сачувај"
     publish: "Објави"
     create: "Направи"
-#    fork: "Fork"
+    fork: "Форкуј"
     play: "Играј" # When used as an action verb, like "Play next level"
     retry: "Покушај поново"
     actions: "Радње"
@@ -675,17 +675,17 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     level_to_unlock: "Ниво који треба откључати:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
     restricted_to_certain_heroes: "Само одређени хероји могу да играју овај ниво."
 
-#  skill_docs:
-#    function: "function" # skill types
-#    method: "method"
-#    snippet: "snippet"
-#    number: "number"
-#    array: "array"
-#    object: "object"
-#    string: "string"
+  skill_docs:
+    function: "функција" # skill types
+    method: "метод"
+    snippet: "исечак"
+    number: "број"
+    array: "низ"
+    object: "објекат"
+    string: "стринг"
 #    writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this
 #    read_only: "read-only"
-#    action: "Action"
+    action: "Aкција"
 #    spell: "Spell"
 #    action_name: "name"
 #    action_cooldown: "Takes"
@@ -938,15 +938,15 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     password_mismatch: "Шифре се не слажу."
     password_repeat: "Понови своју шифру."
 
-#  keyboard_shortcuts:
-#    keyboard_shortcuts: "Keyboard Shortcuts"
-#    space: "Space"
-#    enter: "Enter"
-#    press_enter: "press enter"
-#    escape: "Escape"
-#    shift: "Shift"
-#    run_code: "Run current code."
-#    run_real_time: "Run in real time."
+  keyboard_shortcuts:
+    keyboard_shortcuts: "Пречице за тастатуру"
+    space: "Space"
+    enter: "Enter"
+    press_enter: "притисни enter"
+    escape: "Escape"
+    shift: "Shift"
+    run_code: "Покрени тренутни код."
+    run_real_time: "Покрени у реалном времену."
 #    continue_script: "Continue past current script."
 #    skip_scripts: "Skip past all skippable scripts."
 #    toggle_playback: "Toggle play/pause."
@@ -959,8 +959,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    beautify: "Beautify your code by standardizing its formatting."
 #    maximize_editor: "Maximize/minimize code editor."
 
-#  community:
-#    main_title: "CodeCombat Community"
+  community:
+    main_title: "CodeCombat Заједница"
 #    introduction: "Check out the ways you can get involved below and decide what sounds the most fun. We look forward to working with you!"
 #    level_editor_prefix: "Use the CodeCombat"
 #    level_editor_suffix: "to create and edit levels. Users have created levels for their classes, friends, hackathons, students, and siblings. If create a new level sounds intimidating you can start by forking one of ours!"
@@ -968,53 +968,53 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites."
 #    article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the"
 #    article_editor_suffix: "and help CodeCombat players get the most out of their playtime."
-#    find_us: "Find us on these sites"
-#    social_github: "Check out all our code on GitHub"
-#    social_blog: "Read the CodeCombat blog on Sett"
-#    social_discource: "Join the discussion on our Discourse forum"
-#    social_facebook: "Like CodeCombat on Facebook"
-#    social_twitter: "Follow CodeCombat on Twitter"
-#    social_gplus: "Join CodeCombat on Google+"
-#    social_slack: "Chat with us in the public CodeCombat Slack channel"
-#    contribute_to_the_project: "Contribute to the project"
+    find_us: "Нађи нас на овим сајтовима"
+    social_github: "Погледај цео наш код на GitHub-у"
+    social_blog: "Читај CodeCombat блог на Sett-у"
+    social_discource: "Придружи се дискусији на нашем Discourse форуму"
+    social_facebook: "Лајкуј CodeCombat на Фејсбуку"
+    social_twitter: "Запрати CodeCombat на Твитеру"
+    social_gplus: "Придружи се CodeCombat-у на Гугл+"
+    social_slack: "Ћаскај са нама на јавном CodeCombat Slack каналу"
+    contribute_to_the_project: "Допринеси пројекту"
 
-#  clans:
-#    clan: "Clan"
-#    clans: "Clans"
-#    new_name: "New clan name"
-#    new_description: "New clan description"
-#    make_private: "Make clan private"
-#    subs_only: "subscribers only"
-#    create_clan: "Create New Clan"
-#    private_preview: "Preview"
-#    private_clans: "Private Clans"
-#    public_clans: "Public Clans"
-#    my_clans: "My Clans"
-#    clan_name: "Clan Name"
-#    name: "Name"
+  clans:
+    clan: "Клан"
+    clans: "Кланови"
+    new_name: "Име новог клана"
+    new_description: "Опис новог клана"
+    make_private: "Направи клан приватним"
+    subs_only: "само за претплатнике"
+    create_clan: "Направи нови клан"
+    private_preview: "Preview"
+    private_clans: "Приватни кланови"
+    public_clans: "Јавни кланови"
+    my_clans: "Моји кланови"
+    clan_name: "Име клана"
+    name: "Име"
 #    chieftain: "Chieftain"
 #    type: "Type"
-#    edit_clan_name: "Edit Clan Name"
-#    edit_clan_description: "Edit Clan Description"
-#    edit_name: "edit name"
-#    edit_description: "edit description"
-#    private: "(private)"
+    edit_clan_name: "Измени име клана"
+    edit_clan_description: "Измени опис клана"
+    edit_name: "измени име"
+    edit_description: "измени опис"
+    private: "(приватан)"
 #    summary: "Summary"
 #    average_level: "Average Level"
 #    average_achievements: "Average Achievements"
-#    delete_clan: "Delete Clan"
-#    leave_clan: "Leave Clan"
-#    join_clan: "Join Clan"
-#    invite_1: "Invite:"
+    delete_clan: "Избриши клан"
+    leave_clan: "Напусти клан"
+    join_clan: "Придружи се клану"
+    invite_1: "Позови:"
 #    invite_2: "*Invite players to this Clan by sending them this link."
-#    members: "Members"
-#    progress: "Progress"
+    members: "Чланови"
+    progress: "Напредак"
 #    not_started_1: "not started"
 #    started_1: "started"
 #    complete_1: "complete"
 #    exp_levels: "Expand levels"
 #    rem_hero: "Remove Hero"
-#    status: "Status"
+    status: "Статус"
 #    complete_2: "Complete"
 #    started_2: "Started"
 #    not_started_2: "Not Started"
@@ -1873,15 +1873,15 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     year: "Година"
     day: "Дан"
     month: "Месец"
-    january: "Јануар"
-    february: "Фебруар"
-    march: "Март"
-    april: "Април"
-    may: "Мај"
-    june: "Јун"
-    july: "Јул"
-    august: "Август"
-    september: "Септембар"
-    october: "Октобар"
-    november: "Новембар"
-    december: "Децембар"
+    january: "јануар"
+    february: "фебруар"
+    march: "март"
+    april: "април"
+    may: "мај"
+    june: "јун"
+    july: "јул"
+    august: "август"
+    september: "септембар"
+    october: "октобар"
+    november: "новембар"
+    december: "децембар"

app/locale/uk.coffee

@@ -38,10 +38,10 @@ module.exports = nativeDescription: "Українська", englishDescription:
     accessible_to: "Доступно" # Accessible to
     everyone: "кожному" # everyone
     democratizing: "Навчання, доступне кожному, — наша головна мета. Кожен повинен мати можливість навчитись програмувати." # Democratizing the process of learning coding is at the core of our philosophy. Everyone should be able to learn to code.
-#    forgot_learning: "I think they actually forgot that they were actually learning something."
-#    wanted_to_do: " Coding is something I've always wanted to do, and I never thought I would be able to learn it in school."
-#    why_games: "Why is learning through games important?"
-#    games_reward: "Games reward the productive struggle."
+    forgot_learning: "Таке враження, що, граючи, вони забули, що це навчання."
+    wanted_to_do: " Програмування — те, чим я завжди хотів займатись, ніколи не думав, що буду вчити це в школі."
+    why_games: "Чому навчання через гру важливе?"
+    games_reward: "Гра — винагорода за зусилля."
     encourage: "Гра заохочує спілкуватись, відкривати щось нове і вчитись на помилках. Хороша гра змушує гравця весь час покращувати власні навички, що подібно до процесу роботи учнів під час навчання." # Gaming is a medium that encourages interaction, discovery, and trial-and-error. A good game challenges the player to master skills over time, which is the same critical process students go through as they learn.
 #    excel: "Games excel at rewarding"
 #    struggle: "productive struggle"

app/locale/vi.coffee

@@ -15,7 +15,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     or_ipad: "Hoặc tải phiên bản dành cho iPad"
 
   new_home:
-    slogan: "Tựa game hấp dẫn nhất để học lập trình."
+    slogan: "Trò chơi hấp dẫn nhất để học lập trình."
     classroom_edition: "Phiên bản Lớp học:"
     learn_to_code: "Học lập trình:"
     teacher: "Giáo viên"
@@ -24,28 +24,28 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     im_a_teacher: "Tôi là Giáo viên"
     im_a_student: "Tôi là Học viên"
     learn_more: "Tìm hiểu thêm"
-    classroom_in_a_box: "Một lớp học đặc biệt cho bộ môn công nghệ thông tin."
-    codecombat_is: "CodeCombat là nền tảng <strong>cho học sinh</strong> tiếp cận với bộ môn công nghệ thông tin bằng cách chơi game."
-    our_courses: "Các khóa học của chúng tôi đã được thử nghiệm để <strong>triển khai trong lớp học</strong>, thậm chí được yêu thích bởi các giáo viên có ít hoặc không có kinh nghiệm lập trình."
-    top_screenshots_hint: "Học viên viết code và có thể cập nhật kết quả ngay lập tức"
+    classroom_in_a_box: "Một lớp học đặc biệt dành cho bộ môn công nghệ thông tin."
+    codecombat_is: "CodeCombat là nền tảng <strong>giúp cho học sinh</strong> tiếp cận với bộ môn công nghệ thông tin bằng cách chơi game."
+    our_courses: "Các khóa học của chúng tôi đã được thử nghiệm để <strong>triển khai trong các lớp học</strong>, thậm chí được sử dụng bởi các giáo viên có ít hoặc không có kinh nghiệm lập trình."
+    top_screenshots_hint: "Học viên viết code và cập nhật kết quả ngay lập tức"
     designed_with: "Được thiết kế để dạy học"
     real_code: "Thực tế, tự viết code"
     from_the_first_level: "ngay từ trình độ đầu tiên"
     getting_students: "Cho phép học viên viết code ngay từ đầu là vô cùng quan trọng trong việc làm quen cú pháp và học cấu trúc lập trình."
     educator_resources: "Xây dựng bài giảng"
     course_guides: "và các khóa học"
-    teaching_computer_science: "Việc dạy bộ môn công nghệ thông tin không nhất thiết yêu cầu một tấm bằng đắt tiền, bởi vì chúng tôi cung cấp sẵn công cụ dành cho người giảng dạy dù cho bạn là ai."
+    teaching_computer_science: "Việc giảng dạy bộ môn công nghệ thông tin không nhất thiết yêu cầu một tấm bằng đắt tiền, bởi vì chúng tôi cung cấp sẵn công cụ dành cho các giảng viên."
     accessible_to: "Tiếp cận dễ dàng"
     everyone: "cho mọi người"
     democratizing: "Xã hội hóa quá trình học lập trình là tôn chỉ của chúng tôi. Mọi người đều có thể học code."
     forgot_learning: "Tôi nghĩ học viên không để ý rằng họ thực sự đang học."
-    wanted_to_do: "Lập trình là điều mà em luôn muốn làm, và em không thể nghĩ rằng em có thể học nó ngay ở trường."
+    wanted_to_do: "Lập trình là điều mà em luôn muốn làm, em không thể nghĩ rằng em có thể học nó ngay tại trường."
     why_games: "Tại sao học thông qua chơi game lại quan trọng?"
     games_reward: "Game cổ vũ một cách tích cực."
-    encourage: "Game là môi trường khuyến khích sự tương tác, khám phá, và tinh thần không sợ thất bại. Một tựa game hay sẽ thử thách người chơi giúp họ dần dần hoàn thiện kĩ năng, điều này cũng giống như quá trình học tập của một học viên trong lớp học vậy."
+    encourage: "Game là môi trường khuyến khích sự tương tác, khám phá, và tinh thần không sợ thất bại. Một tựa game hay sẽ thử thách người chơi giúp họ dần dần hoàn thiện kĩ năng, điều này cũng giống như quá trình học tập của một học sinh trong lớp học vậy."
     excel: "Game cổ vũ"
     struggle: "những cố gắng tích cục"
-    kind_of_struggle: "những sự cố gắng trong học tập mà thực sự dem lại sự cuốn hút"
+    kind_of_struggle: "những sự cố gắng trong học tập mà thực sự dem lại sự cuốn hút, "
     motivating: "tạo động lực"
     not_tedious: "mà không hề buồn chán."
     gaming_is_good: "Nghiên cứu chứng minh chơi game tốt cho não bộ của trẻ. (đúng vậy đấy!)"
@@ -56,7 +56,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     feedback: "Việc chơi game cũng giúp học sinh tương tác để có thể phát triển tư duy một cách toàn diện hơn, thay vì chỉ biết đến đáp án “đúng” hoặc “sai”."
     real_game: "Game thật, code thật."
     great_game: "Một tựa game hay không chỉ cần những huy chương hay thành tích hào nhoáng - quan trọng hơn hết là trải nghiệm của người chơi, những thử thách tinh tế, đồng thời là khả năng đối đầu và vượt qua thử thách."
-    agency: "CodeCombat là game đưa ra cho người chơi những thử thách buộc họ phải vượt qua bằng cách viết code, điều này giúp cho cả những người mới bắt đầu và những học viên trình độ nâng cao luyện tập khả năng lập trình thành thạo."
+    agency: "CodeCombat là trò chơi đưa ra cho người chơi những thử thách buộc họ phải vượt qua bằng cách viết code, điều này giúp cho cả những người mới bắt đầu và những học viên trình độ nâng cao luyện tập khả năng lập trình thành thạo."
     request_demo_title: "Bắt đầu giảng dạy ngay hôm nay!"
     request_demo_subtitle: "Yêu cầu demo và chuẩn bị sẵn sàng cho học viên của bạn chỉ trong vòng một tiếng đồng hồ."
     get_started_title: "Xây dựng lớp học của bạn ngay hôm nay"
@@ -73,7 +73,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     lesson_time: "Thời gian học:"
     coming_soon: "Sắp ra mắt!"
     courses_available_in: "Các khóa học giảng dạy JavaScript, Python, và Java (sắp ra mắt!)"
-    boast: "Đưa ra những câu đố đủ khó để hấp dẫn cả game thủ và coder."
+    boast: "Đưa ra những câu đố đủ khó để hấp dẫn cả các game thủ và coder."
     winning: "Một sự kết hợp hoàn hảo giữa game RPG và bài tập lập trình, giúp việc giáo dục trẻ thú vị hơn bao giờ hết."
     run_class: "Mọi thứ bạn cần để tổ chức một lớp học công nghệ thông tin ngay hôm nay, không yêu cầu kinh nghiệm lập trình."
     teachers: "Giáo viên!"
@@ -84,7 +84,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     join_class: "Tham gia Lớp học"
     role: "Vai trò của bạn:"
     student_count: "Số học viên:"
-    start_playing_for_free: "Bắt đầu Chơi Miễn phí!"
+    start_playing_for_free: "Bắt Đầu Chơi Miễn Phí!"
     students_and_players: "Học viên và Người chơi"
     goto_classes: "Tới Lớp học của tôi" # {change}
     view_profile: "Xem hồ sơ của tôi"
@@ -259,7 +259,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     sign_up: "Đăng Ký"
     log_in: "đăng nhập với mật khẩu"
     required: "Bạn cần phải đăng nhập trước khi muốn tiếp tục."
-    login_switch: "Bạn đã có tài khoản rồi?"
+    login_switch: "Bạn đã có tài khoản?"
     school_name: "Tên Trường và Thành phố"
     optional: "không bắt buộc"
     school_name_placeholder: "Ví dụ tên Trường, Thành phố, (Tiểu bang nếu đang ở Mỹ)"
@@ -1261,16 +1261,16 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    students_enrolled: "students enrolled"
 #    students_assigned: "students assigned"
 #    length: "Length:"
-    title: "Tiêu đề" # Flat style redesign
-#    subtitle: "Review course guidelines, solutions, and levels"
-#    changelog: "View latest changes to course levels."
-#    select_language: "Select language"
-#    select_level: "Select level"
-#    play_level: "Play Level"
-#    concepts_covered: "Concepts covered"
-#    print_guide: "Print Guide (PDF)"
-#    view_guide_online: "View Guide Online (PDF)"
-#    last_updated: "Last updated:"
+    title: "Các khóa học" # Flat style redesign
+    subtitle: "Xem giáo án của các khóa học, lời giải và các màn chơi"
+    changelog: "Xem những thay đổi mới nhất về các khóa học."
+    select_language: "Chọn ngôn ngữ"
+    select_level: "Chọn màn chơi"
+    play_level: "Chơi Màn Chơi"
+    concepts_covered: "Bao gồm các khái niệm"
+    print_guide: "In Hướng Dẫn (PDF)"
+    view_guide_online: "Xem Hướng Dẫn Online (PDF)"
+    last_updated: "Cập nhật lần cuối:"
 #    grants_lifetime_access: "Grants access to all Courses."
 #    enrollment_credits_available: "Enrollment Credits Available:"
     description: "Mô tả" # ClassroomSettingsModal
@@ -1292,7 +1292,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     student_age_range_to: "tới"
     create_class: "Tạo Lớp"
     class_name: "Tên lớp"
-#    teacher_account_restricted: "Your account is a teacher account, and so cannot access student content."
+    teacher_account_restricted: "Tài khoản của bạn là tài khoản Giáo Viên, vì thế bạn không thể truy cập nội dung dành cho học viên."
 
   teacher:
     teacher_dashboard: "Bảng Điều Khiển Giáo Viên" # Navbar

app/locale/zh-HANT.coffee

@@ -279,8 +279,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     recovery_sent: "密碼重置的信件已寄出"
 
   items:
-    primary: "主要武器"
-    secondary: "次要武器"
+    primary: "主手裝備"
+    secondary: "副手裝備"
     armor: "裝甲"
     accessories: "飾品"
     misc: "輔助"
@@ -344,10 +344,10 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     confirm_password: "確認密碼"
     message: "訊息"
     code: "程式碼"
-    ladder: "升級比賽"
-    when: "當"
+    ladder: "天梯"
+    when: "何時"
     opponent: "對手"
-    rank: "階級"
+    rank: "排名"
     score: "分數"
     win: "獲勝"
     loss: "失敗"
@@ -472,7 +472,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     tip_reticulating: "網格狀鋸齒(指卡頓現象)"
     tip_harry: "巫師，"
     tip_great_responsibility: "隨著擁有強大的編程技巧，除錯的責任將越大。"
-    tip_munchkin: "如果您不吃掉您的蔬菜，那小矮人將在您沉睡時找到您。"
+    tip_munchkin: "如果您不吃掉您的蔬菜，那些矮人將在您睡覺時找到您。"
     tip_binary: "只有2種人在這世上：那些懂2進位的，和那些不懂的。"
     tip_commitment_yoda: "一個程式員必須擁有強烈的責任感和一顆認真的心。 ~ Yoda《星際大戰》"
     tip_no_try: "做，或者不做。這邊不存在嘗試的選項。 - Yoda《星際大戰》"
@@ -510,7 +510,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     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: "磨利劍鋒。"#"Sharpening the swords."
     tip_ratatouille: "你不需要讓任何人以你的出身決定你的極限，你唯一的限制就是你的心靈。廚神Gusteau《料理鼠王》 "#"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: "搬來網路世界吧，這裡十分不錯。我們住的地方天氣總是很好。 - John Green"#"Just move to the internet, it's great here. We get to live inside where the weather is always awesome. - John Green"
@@ -725,37 +725,37 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     editor_config_behaviors_description: "自動填入小括號、大括號以及引號。"
 
   about:
-#    main_title: "If you want to learn to program, you need to write (a lot of) code."
-#    main_description: "At CodeCombat, our job is to make sure you're doing that with a smile on your face."
-#    mission_link: "Mission"
-#    team_link: "Team"
-#    story_link: "Story"
-#    press_link: "Press"
-#    mission_title: "Our mission: make programming accessible to every student on Earth."
-#    mission_description_1: "<strong>Programming is magic</strong>. It's the ability to create things from pure imagination. We started CodeCombat to give learners the feeling of wizardly power at their fingertips by using <strong>typed code</strong>."
-#    mission_description_2: "As it turns out, that enables them to learn faster too. WAY faster. It's like having a conversation instead of reading a manual. We want to bring that conversation to every school and to <strong>every student</strong>, because everyone should have the chance to learn the magic of programming."
-#    team_title: "Meet the CodeCombat team"
-#    team_values: "We value open and respectful dialog, where the best idea wins. Our decisions are grounded in customer research and our process is focused on delivering tangible results for them. Everyone is hands-on, from our CEO to our Github contributors, because we value growth and learning in our team."
+    main_title: "如果您想要學編程，你需要寫(一大堆)程式碼。"#"If you want to learn to program, you need to write (a lot of) code."
+    main_description: "在CodeCombat中，我們的職責是確保您笑著玩遊戲。"    #"At CodeCombat, our job is to make sure you're doing that with a smile on your face."
+    mission_link: "任務"#"Mission"
+    team_link: "隊伍"#"Team"
+    story_link: "故事"#"Story"
+    press_link: "按"#"Press"
+    mission_title: "我們的任務為：讓世上每個學生都有機會能學會編程。"    #"Our mission: make programming accessible to every student on Earth."
+    mission_description_1: "<strong>編程是一種魔法</strong>。它是一種從純粹的想像中創造東西的能力。我們營運CodeCombat來讓學習者可以透過<strong>鍵入程式碼</strong>在指尖感覺到巫師般的力量。"    #"<strong>Programming is magic</strong>. It's the ability to create things from pure imagination. We started CodeCombat to give learners the feeling of wizardly power at their fingertips by using <strong>typed code</strong>."
+    mission_description_2: "它的出現也讓使用者學得更快，就像是與它對話而不是閱讀手冊一般。我們想將這種對話帶給每一個學校以及<strong>每一位學生</strong>，因為每個人都應該要有機會體會編程的魔力。 "    #"As it turns out, that enables them to learn faster too. WAY faster. It's like having a conversation instead of reading a manual. We want to bring that conversation to every school and to <strong>every student</strong>, because everyone should have the chance to learn the magic of programming."
+    team_title: "認識CodeCombat團隊。"#"Meet the CodeCombat team"
+    team_values: "我們重視開放且互相尊重的對話，好的想法才會勝出。我們的抉擇建立於客戶調查上，且過程注重於將具體的結果交給客戶。從我們的CEO到我們的Github貢獻者，每一個人都會動手參與，因為我們傾向在團隊中學習成長。"    #"   We value open and respectful dialog, where the best idea wins. Our decisions are grounded in customer research and our process is focused on delivering tangible results for them. Everyone is hands-on, from our CEO to our Github contributors, because we value growth and learning in our team."
     nick_title: "程式員" # {change}
-    nick_blurb: "亢奮的Guru"
+    nick_blurb: "亢奮的咕嚕"
     matt_title: "共同創辦人" # {change}
     cat_title: "首席開卡設計師" # {change}
     cat_blurb: "氣宗"
     scott_title: "共同創辦人" # {change}
     scott_blurb: "理性至上"
-#    maka_title: "Customer Advocate"
+    maka_title: "客戶代言人" #"Customer Advocate"
     maka_blurb: "說書人"
     rob_title: "編譯工程師" # {change}
     rob_blurb: "編寫一些的程式碼"
     josh_c_title: "遊戲設計師"
     josh_c_blurb: "設計遊戲"
-#    robin_title: "UX Design & Research"
-#    robin_blurb: "Scaffolding"
+    robin_title: "使用者體驗研究與設計"#"UX Design & Research"
+    robin_blurb: "鷹架"#"Scaffolding"
     josh_title: "遊戲設計師"
     josh_blurb: "地面是熔岩"
-#    phoenix_title: "Software Engineer"
-#    nolan_title: "Territory Manager"
-#    elliot_title: "Partnership Manager"
+    phoenix_title: "軟體工程師"#"Software Engineer"
+    nolan_title: "區域經理"#"Territory Manager"
+    elliot_title: "合作經裡"#"Partnership Manager"
     retrostyle_title: "插畫師"
     retrostyle_blurb: "復古風格的遊戲"
     jose_title: "音樂"
@@ -1566,41 +1566,41 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 
   ladder:
     please_login: "在參與對戰前請先登入。"
-    my_matches: "我的對手"
+    my_matches: "我的對戰"
     simulate: "模擬"
-    simulation_explanation: "通過模擬遊戲，您可以使您的遊戲更快得到評分！"
+    simulation_explanation: "通過模擬遊戲，您可以使您的遊戲更快得到評定排名！"
     simulation_explanation_leagues: "你主要會為你的部落或者課程的同伴幫忙模擬遊戲。"
     simulate_games: "模擬遊戲！"
     games_simulated_by: "您模擬過的次數："
     games_simulated_for: "替您模擬的次數："
     games_in_queue: "遊戲正在列隊中："
-    games_simulated: "遊戲已模擬"
+    games_simulated: "遊戲模擬次數"
     games_played: "玩過的遊戲"
-    ratio: "通過率"
+    ratio: "比率"
     leaderboard: "排行榜"
     battle_as: "我要扮演 "
     summary_your: "您的 "
     summary_matches: "對手 - "
     summary_wins: " 勝利，"
     summary_losses: " 失敗"
-    rank_no_code: "沒有新程式碼可評分"
-    rank_my_game: "對我的遊戲評分！"
+    rank_no_code: "沒有新程式碼可評定排名"
+    rank_my_game: "對我的遊戲評定排名！"
     rank_submitting: "上傳中…"
-    rank_submitted: "已上傳以求評分"
-    rank_failed: "評分失敗"
-    rank_being_ranked: "已評分"
+    rank_submitted: "已上傳以求評定排名"
+    rank_failed: "評定失敗"
+    rank_being_ranked: "已評定"
     rank_last_submitted: "已上傳 "
     help_simulate: "幫我們模擬遊戲？"
-    code_being_simulated: "您的新程式碼正在被其他人模擬評分中。分數將隨每次新的配對而更新。"
+    code_being_simulated: "您的新程式碼正在被其他人模擬評定中。分數將隨每次新的配對而更新。"
     no_ranked_matches_pre: "對這個隊伍尚未有評分過的配對！"
-    no_ranked_matches_post: " 在別人的戰場上扮演對手並且回到這使您的程式碼接受評分。"
+    no_ranked_matches_post: " 在別人的戰場上扮演對手並且回到這使您的程式碼接受評定排名。"
     choose_opponent: "選擇對手"
     select_your_language: "選擇您的語言！"
     tutorial_play: "教學"
     tutorial_recommended: "如果您尚未玩過，建議先嘗試教學"
     tutorial_skip: "略過教學"
     tutorial_not_sure: "不確定發生啥事？"
-    tutorial_play_first: "先嘗試教學"
+    tutorial_play_first: "先試試教學"
     simple_ai: "簡單人工智慧" # {change}
     warmup: "熱身"
     friends_playing: "與朋友連線"
@@ -1609,7 +1609,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     invite_friends_to_battle: "邀請您的朋友加入此戰鬥！"
     fight: "戰鬥！"
     watch_victory: "觀看您的勝利"
-    defeat_the: "擊敗"
+    defeat_the: "敗於"
     watch_battle: "觀看戰役"
     tournament_started: "，錦標賽已開始"
     tournament_ends: "錦標賽結束"

app/templates/common/user.jade

@@ -3,11 +3,11 @@ extends /templates/base
 // User pages might have some user page specific header, if not remove this
 block content
   .clearfix
-    if user && viewName
+    if view.userData && view.viewName
       ol.breadcrumb
         li
-          a(href="/user/#{user.getSlugOrID()}") #{user.displayName()}
+          a(href="/user/#{view.userData.getSlugOrID()}") #{view.userData.displayName()}
         li.active
-          | #{viewName}
-    if !user || user.loading
+          | #{view.viewName}
+    if !view.userData || view.userData.loading
       | LOADING

app/templates/user/main-user-view.jade

@@ -9,24 +9,25 @@ block append content
       a(href="/account", data-i18n="nav.account")
     li.active(data-i18n="nav.profile")
 
-  if user
+  if view.user
+    - var playerLevel = view.user.level()
+    - var emails = view.user.getEnabledEmails()
     .vertical-buffer
     .row
       .left-column
         .profile-wrapper
-          img.picture(src="#{user.getPhotoURL(150)}" alt="")
+          img.picture(src="#{view.user.getPhotoURL(150)}" alt="")
           div.profile-info
-            h3.name= user.get('name')
-            if favoriteLanguage
+            h3.name= view.user.get('name')
+            if view.favoriteLanguage
               div.extra-info
                 span(data-i18n="user.favorite_prefix") Favorite language is
-                strong.favorite-language= favoriteLanguage
-                span(data-i18n="user.favorite_postfix") .
+                strong.favorite-language= view.favoriteLanguage
+                span(data-i18n="user.favorite_postfix") .            
             if playerLevel
               div.extra-info
                 span.spr(data-i18n="general.player_level") Level
-                strong= playerLevel
-        - var emails = user.getEnabledEmails()
+                strong= playerLevel        
         // TODO: fix this, use some other method for finding contributor classes other than email settings, since they're private... Maybe achievements?
         if emails
           ul.contributor-categories
@@ -64,22 +65,22 @@ block append content
         .panel.panel-default
           .panel-heading
             h3.panel-title(data-i18n="clans.clans") Clans
-          if (!clans)
+          if (!view.clanModels)
             .panel-body
               p(data-i18n="common.loading")
-          else if (clans.length)
+          else if (view.clanModels.length)
             table.table
               tr
                 th.col-xs-4(data-i18n="clans.name") Name
                 th.col-xs-4(data-i18n="clans.chieftain") Chieftain
                 th.col-xs-4(data-i18n="play.heroes") Heroes
-              each clan in clans
+              each clan in view.clanModels
                 tr
                   td
                     a(href="/clans/#{clan.id}")= clan.get('name')
                   td
-                    if idNameMap && idNameMap[clan.get('ownerID')]
-                      a(href="/user/#{clan.get('ownerID')}")= idNameMap[clan.get('ownerID')]
+                    if view.idNameMap && view.idNameMap[clan.get('ownerID')]
+                      a(href="/user/#{clan.get('ownerID')}")= view.idNameMap[clan.get('ownerID')]
                     else
                       a(href="/user/#{clan.get('ownerID')}") Anonymous
                   td= clan.get('members').length
@@ -90,17 +91,17 @@ block append content
         .panel.panel-default
           .panel-heading
             h3.panel-title(data-i18n="user.singleplayer_title") Singleplayer Levels
-          if (!singlePlayerSessions)
+          if (!view.singlePlayerSessions)
             .panel-body
               p(data-i18n="common.loading") Loading...
-          else if (singlePlayerSessions.length)
+          else if (view.singlePlayerSessions.length)
             table.table
               tr
                 th.col-xs-4(data-i18n="resources.level") Level
                 th.col-xs-4(data-i18n="user.last_played") Last Played
                 th.col-xs-4(data-i18n="user.status") Status
               - var count = 0
-              each session, index in singlePlayerSessions
+              each session, index in view.singlePlayerSessions
                 if session.get('levelName')
                   tr(class=count > 4 ? 'hide' : '')
                     - count++;
@@ -120,16 +121,16 @@ block append content
         .panel.panel-default
           .panel-heading
             h3.panel-title(data-i18n="user.multiplayer_title") Multiplayer Levels
-          if (!multiPlayerSessions)
+          if (!view.multiPlayerSessions)
             .panel-body
               p(data-i18n="common.loading") Loading...
-          else if (multiPlayerSessions.length)
+          else if (view.multiPlayerSessions.length)
             table.table
               tr
                 th.col-xs-4(data-i18n="resources.level") Level
                 th.col-xs-4(data-i18n="user.last_played") Last Played
                 th.col-xs-4(data-i18n="general.score") Score
-              each session, index in multiPlayerSessions
+              each session, index in view.multiPlayerSessions
                 tr(class=index > 4 ? 'hide' : '')
                   td
                     - var posturl = ''
@@ -140,7 +141,7 @@ block append content
                     td= parseInt(session.get('totalScore') * 100)
                   else
                     td(data-i18n="user.status_unfinished") Unfinished
-            if multiPlayerSessions.length > 4
+            if view.multiPlayerSessions.length > 4
               .panel-footer
                 button.btn.btn-info.btn-sm.more-button(data-i18n="editor.more")
           else
@@ -149,10 +150,10 @@ block append content
         .panel.panel-default
           .panel-heading
             h3.panel-title(data-i18n="user.achievements_title") Achievements
-          if ! earnedAchievements
+          if ! view.earnedAchievements
             .panel-body
               p(data-i18n="common.loading") Loading...
-          else if ! earnedAchievements.length
+          else if ! view.earnedAchievements.length
             .panel-body
               p(data-i18n="user.no_achievements") No achievements earned so far.
           else
@@ -161,7 +162,7 @@ block append content
                 th.col-xs-4(data-i18n="achievements.achievement") Achievement
                 th.col-xs-4(data-i18n="achievements.last_earned") Last Earned
                 th.col-xs-4(data-i18n="achievements.amount_achieved") Amount
-              each achievement, index in earnedAchievements.models
+              each achievement, index in view.earnedAchievements.models
                 tr(class=index > 4 ? 'hide' : '')
                   td= achievement.get('achievementName')
                   td= moment(achievement.get('changed')).format("MMMM Do YYYY")
@@ -169,6 +170,6 @@ block append content
                     td= achievement.get('achievedAmount')
                   else
                     td
-            if earnedAchievements.length > 4
+            if view.earnedAchievements.length > 4
               .panel-footer
                 button.btn.btn-info.btn-sm.more-button(data-i18n="editor.more")

app/views/common/UserView.coffee

@@ -19,21 +19,12 @@ module.exports = class UserView extends RootView
     @user = new User _id: @userID
     @supermodel.loadModel @user, cache: false
 
-  getRenderData: ->
-    context = super()
-    context.viewName = @viewName
-    context.user = @user unless @user?.isAnonymous()
-    context
-
   isMe: -> @userID in [me.id, me.get('slug')]
 
   onLoaded: ->
-    @onUserLoaded @user if @user.loaded and not @userLoaded
-    super()
-
-  onUserLoaded: ->
+    @userData = @user unless @user?.isAnonymous()
     @userID = @user.id
-    @userLoaded = true
+    super()
 
   ifUserNotFound: ->
     console.warn 'user not found'

app/views/play/menu/GuideView.coffee

@@ -19,12 +19,13 @@ module.exports = class LevelGuideView extends CocoView
     @levelSlug = options.level.get('slug')
     @sessionID = options.session.get('_id')
     @requiresSubscription = not me.isPremium()
-    @helpVideos = options.level.get('helpVideos') ? []
+    @isCourseLevel = options.level.get('type', true) in ['course', 'course-ladder']
+    @helpVideos = if @isCourseLevel then [] else options.level.get('helpVideos') ? []
     @trackedHelpVideoStart = @trackedHelpVideoFinish = false
     # A/B Testing video tutorial styles
     @helpVideosIndex = me.getVideoTutorialStylesIndex(@helpVideos.length)
-    @helpVideo = @helpVideos[@helpVideosIndex] if @helpVideos.length > 0
-    @videoLocked = not (@helpVideo?.free or options.level.get('type', true) in ['course', 'course-ladder']) and @requiresSubscription
+    @helpVideo = @helpVideos[@helpVideosIndex] if @helpVideos.length > 0 and not @isCourseLevel
+    @videoLocked = not (@helpVideo?.free or @isCourseLevel) and @requiresSubscription
 
     @firstOnly = options.firstOnly
     @docs = options?.docs ? options.level.get('documentation') ? {}
@@ -57,7 +58,7 @@ module.exports = class LevelGuideView extends CocoView
   getRenderData: ->
     c = super()
     c.docs = @docs
-    c.showVideo = @helpVideos.length > 0
+    c.showVideo = @helpVideos.length > 0 unless @isCourseLevel
     c.videoLocked = @videoLocked
     c
 

app/views/user/MainUserView.coffee

@@ -26,59 +26,39 @@ module.exports = class MainUserView extends UserView
   destroy: ->
     @stopListening?()
 
-  getRenderData: ->
-    context = super()
-    if @levelSessions and @levelSessions.loaded
-      singlePlayerSessions = []
-      multiPlayerSessions = []
-      languageCounts = {}
-      for levelSession in @levelSessions.models
-        if levelSession.isMultiplayer()
-          multiPlayerSessions.push levelSession
-        else
-          singlePlayerSessions.push levelSession
-        language = levelSession.get('codeLanguage') or levelSession.get('submittedCodeLanguage')
-        if language
-          languageCounts[language] = (languageCounts[language] or 0) + 1
-      mostUsedCount = 0
-      favoriteLanguage = null
-      for language, count of languageCounts
-        if count > mostUsedCount
-          mostUsedCount = count
-          favoriteLanguage = language
-      context.singlePlayerSessions = singlePlayerSessions
-      context.multiPlayerSessions = multiPlayerSessions
-      context.favoriteLanguage = favoriteLanguage
-      context.playerLevel = @user.level()
-    if @earnedAchievements and @earnedAchievements.loaded
-      context.earnedAchievements = @earnedAchievements
-    if @clans and @clans.loaded
-      context.clans = @clans.models
-      context.idNameMap = @idNameMap
-    context
-
   onLoaded: ->
-    if @user.loaded and not (@earnedAchievements or @levelSessions)
-      @supermodel.resetProgress()
-      @levelSessions = new LevelSessionsCollection @user.getSlugOrID()
-      @earnedAchievements = new EarnedAchievementCollection @user.getSlugOrID()
-      @supermodel.loadCollection @levelSessions, 'levelSessions', {cache: false}
-      @supermodel.loadCollection @earnedAchievements, 'earnedAchievements', {cache: false}
+    if @user.loaded
+      if !@levelSessions
+        @levelSessions = new LevelSessionsCollection @user.getSlugOrID()      
+        @listenTo @levelSessions, 'sync', =>
+          @onSyncLevelSessions @levelSessions?.models
+          @render()
+        @supermodel.loadCollection @levelSessions, 'levelSessions', {cache: false}
+
+      if !@earnedAchievements
+        @earnedAchievements = new EarnedAchievementCollection @user.getSlugOrID()
+        @listenTo @earnedAchievements, 'sync', =>
+          @render()
+        @supermodel.loadCollection @earnedAchievements, 'earnedAchievements', {cache: false}
+
     sortClanList = (a, b) ->
       if a.get('members').length isnt b.get('members').length
         if a.get('members').length < b.get('members').length then 1 else -1
       else
         b.id.localeCompare(a.id)
-    @idNameMap = {}
+
     @clans = new CocoCollection([], { url: "/db/user/#{@userID}/clans", model: Clan, comparator: sortClanList })
     @listenTo @clans, 'sync', =>
-      @refreshNameMap @clans?.models
+      @onSyncClans @clans?.models
       @render?()
     @supermodel.loadCollection(@clans, 'clans', {cache: false})
+
     super()
 
-  refreshNameMap: (clans) ->
+  onSyncClans: (clans) ->
     return unless clans?
+    @idNameMap = []
+    @clanModels = clans
     options =
       url: '/db/user/-/names'
       method: 'POST'
@@ -88,6 +68,25 @@ module.exports = class MainUserView extends UserView
         @render?()
     @supermodel.addRequestResource('user_names', options, 0).load()
 
+  onSyncLevelSessions: (levelSessions) ->
+    return unless levelSessions?
+    @multiPlayerSessions = []
+    @singlePlayerSessions = []
+    languageCounts = []
+    mostUsedCount = 0
+    for levelSession in levelSessions
+      if levelSession.isMultiplayer()
+        @multiPlayerSessions.push levelSession
+      else
+        @singlePlayerSessions.push levelSession
+      language = levelSession.get('codeLanguage') or levelSession.get('submittedCodeLanguage')
+      if language
+        languageCounts[language] = (languageCounts[language] or 0) + 1
+    for language, count of languageCounts
+      if count > mostUsedCount
+        mostUsedCount = count
+        @favoriteLanguage = language
+
   onClickMoreButton: (e) ->
     panel = $(e.target).closest('.panel')
     panel.find('tr.hide').removeClass('hide')

scripts/vagrant/core/provision.sh

@@ -48,6 +48,7 @@ sudo mount --bind /node_modules /vagrant/node_modules
 # prepare
 find /vagrant/app -type f -exec dos2unix {} \;
 find /vagrant/vendor -type f -exec dos2unix {} \;
+find /vagrant/scripts/vagrant -type f -exec dos2unix {} \;
 sudo chown -R vagrant:vagrant /home/vagrant
 
 # install npm modules

server/handlers/classroom_handler.coffee

@@ -97,7 +97,7 @@ ClassroomHandler = class ClassroomHandler extends Handler
   get: (req, res) ->
     if ownerID = req.query.ownerID
       unless req.user and (req.user.isAdmin() or ownerID is req.user.id)
-        log.debug "classroom_handler.get: ownerID (#{ownerID}) must be yourself (#{req.user.id})"
+        log.debug "classroom_handler.get: ownerID (#{ownerID}) must be yourself (#{req.user?.id})"
         return @sendForbiddenError(res)
       return @sendBadInputError(res, 'Bad ownerID') unless utils.isID ownerID
       Classroom.find {ownerID: mongoose.Types.ObjectId(ownerID)}, (err, classrooms) =>

server/models/User.coffee

@@ -162,6 +162,9 @@ UserSchema.statics.updateServiceSettings = (doc, callback) ->
   return callback?() unless isProduction or GLOBAL.testing
   return callback?() if doc.updatedMailChimp
   return callback?() unless doc.get('email')
+  return callback?() unless doc.get('dateCreated')
+  accountAgeMinutes = (new Date().getTime() - doc.get('dateCreated').getTime?() ? 0) / 1000 / 60
+  return callback?() unless accountAgeMinutes > 30 or GLOBAL.testing
   existingProps = doc.get('mailChimp')
   emailChanged = (not existingProps) or existingProps?.email isnt doc.get('email')
 

server/routes/contact.coffee

@@ -61,7 +61,6 @@ createMailContext = (req, done) ->
     closeIO.getSalesContactEmail fromAddress, (err, salesContactEmail) ->
       console.error "Error getting sales contact for #{sender}: #{err}" if err
       context.recipient.address = salesContactEmail ? config.mail.supportSchools
-      context.sender.address = fromAddress
       done context
   else if recipientID and (user.isAdmin() or ('employer' in (user.get('permissions') ? [])))
     User.findById(recipientID, 'email').exec (err, document) ->