Merge remote-tracking branch 'upstream/master'

app/lib/surface/CocoSprite.coffee

@@ -253,12 +253,12 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       return
     scaleX = if @getActionProp 'flipX' then -1 else 1
     scaleY = if @getActionProp 'flipY' then -1 else 1
-    if @thang.maximizesArc and @thangType.get('name') in ['Arrow', 'Spear']
+    if @thangType.get('name') in ['Arrow', 'Spear']
       # Scales the arrow so it appears longer when flying parallel to horizon.
       # To do that, we convert angle to [0, 90] (mirroring half-planes twice), then make linear function out of it:
       # (a - x) / a: equals 1 when x = 0, equals 0 when x = a, monotonous in between. That gives us some sort of
       # degenerative multiplier.
-      # For our puproses, a = 90 - the direction straight upwards.
+      # For our purposes, a = 90 - the direction straight upwards.
       # Then we use r + (1 - r) * x function with r = 0.5, so that
       # maximal scale equals 1 (when x is at it's maximum) and minimal scale is 0.5.
       # Notice that the value of r is empirical.
@@ -287,24 +287,17 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     rotationType = @thangType.get('rotationType')
     return if rotationType is 'fixed'
     rotation = @getRotation()
-    if @thang.maximizesArc and @thangType.get('name') in ['Arrow', 'Spear']
+    if @thangType.get('name') in ['Arrow', 'Spear']
       # Rotates the arrow to see it arc based on velocity.z.
-      # At midair we must see the original angle (delta = 0), but at launch time
-      # and arrow must point upwards/downwards respectively.
-      # The curve must consider two variables: speed and angle to camera:
-      # higher angle -> higher steep
-      # higher speed -> higher steep (0 at midpoint).
-      # All constants are empirical. Notice that rotation here does not affect thang's state - it is just the effect.
+      # Notice that rotation here does not affect thang's state - it is just the effect.
       # Thang's rotation is always pointing where it is heading.
-      velocity = @thang.velocity.z
-      factor = rotation
-      factor = -factor if factor < 0
-      flip = 1
-      if factor > 90
-        factor = 180 - factor
-        flip = -1 # when the arrow is on the left, 'up' means subtracting
-      factor = Math.max(factor / 90, 0.4) # between 0.4 and 1.0
-      rotation += flip * (velocity / 12) * factor * 45 # theoretically, 45 is the maximal delta we can make here
+      vz = @thang.velocity.z
+      if vz and speed = @thang.velocity.magnitude(true)
+        vx = @thang.velocity.x
+        heading = @thang.velocity.heading()
+        xFactor = Math.cos heading
+        zFactor = vz / Math.sqrt(vz * vz + vx * vx)
+        rotation -= xFactor * zFactor * 45
     imageObject ?= @imageObject
     return imageObject.rotation = rotation if not rotationType
     @updateIsometricRotation(rotation, imageObject)

app/lib/surface/CoordinateDisplay.coffee

@@ -23,9 +23,11 @@ module.exports = class CoordinateDisplay extends createjs.Container
 
   build: ->
     @mouseEnabled = @mouseChildren = false
-    @addChild @label = new createjs.Text("", "40px Arial", "#003300")
-    @label.name = 'position text'
-    @label.shadow = new createjs.Shadow("#FFFFFF", 1, 1, 0)
+    @addChild @background = new createjs.Shape()
+    @addChild @label = new createjs.Text("", "bold 32px Arial", "#FFFFFF")
+    @label.name = 'Coordinate Display Text'
+    @label.shadow = new createjs.Shadow("#000000", 1, 1, 0)
+    @background.name = "Coordinate Display Background"
 
   onMouseOver: (e) -> @mouseInBounds = true
   onMouseOut: (e) -> @mouseInBounds = false
@@ -57,17 +59,34 @@ module.exports = class CoordinateDisplay extends createjs.Container
   hide: ->
     return unless @label.parent
     @removeChild @label
+    @removeChild @background
     @uncache()
 
+  updateSize: ->
+    margin = 6
+    radius = 5
+    width = @label.getMeasuredWidth() + 2 * margin
+    height = @label.getMeasuredHeight() + 2 * margin
+    @label.regX = @background.regX = width / 2 - margin
+    @label.regY = @background.regY = height / 2 - margin
+    @background.graphics
+      .clear()
+      .beginFill("rgba(0, 0, 0, 0.4)")
+      .beginStroke("rgba(0, 0, 0, 0.6)")
+      .setStrokeStyle(1)
+      .drawRoundRect(0, 0, width, height, radius)
+      .endFill()
+      .endStroke()
+    [width, height]
+
   show: =>
     return unless @mouseInBounds and @lastPos and not @destroyed
     @label.text = "(#{@lastPos.x}, #{@lastPos.y})"
-    [width, height] = [@label.getMeasuredWidth(), @label.getMeasuredHeight()]
-    @label.regX = width / 2
-    @label.regY = height / 2
+    [width, height] = @updateSize()
     sup = @camera.worldToSurface @lastPos
     @x = sup.x
-    @y = sup.y - 7
+    @y = sup.y - 5
+    @addChild @background
     @addChild @label
     @cache -width / 2, -height / 2, width, height
     Backbone.Mediator.publish 'surface:coordinates-shown', {}

app/lib/world/GoalManager.coffee

@@ -125,9 +125,9 @@ module.exports = class GoalManager extends CocoClass
         keyFrame: 0 # when it became a 'success' or 'failure'
       }
       @initGoalState(state, [goal.killThangs, goal.saveThangs], 'killed')
-      for getTo in goal.getAllToLocations ? [] 
+      for getTo in goal.getAllToLocations ? []
         @initGoalState(state,[ getTo.getToLocation?.who , [] ], 'arrived')
-      for keepFrom in goal.keepAllFromLocations ? [] 
+      for keepFrom in goal.keepAllFromLocations ? []
         @initGoalState(state,[ [] , keepFrom.keepFromLocation?.who], 'arrived')
       @initGoalState(state, [goal.getToLocations?.who, goal.keepFromLocations?.who], 'arrived')
       @initGoalState(state, [goal.leaveOffSides?.who, goal.keepFromLeavingOffSides?.who], 'left')
@@ -146,11 +146,11 @@ module.exports = class GoalManager extends CocoClass
   onThangTouchedGoal: (e, frameNumber) ->
     for goal in @goals ? []
       @checkArrived(goal.id, goal.getToLocations.who, goal.getToLocations.targets, e.actor, e.touched.id, frameNumber) if goal.getToLocations?
-      if goal.getAllToLocations?    
+      if goal.getAllToLocations?
         for getTo in goal.getAllToLocations
           @checkArrived(goal.id, getTo.getToLocation.who, getTo.getToLocation.targets, e.actor, e.touched.id, frameNumber)
       @checkArrived(goal.id, goal.keepFromLocations.who, goal.keepFromLocations.targets, e.actor, e.touched.id, frameNumber) if goal.keepFromLocations?
-      if goal.keepAllFromLocations? 
+      if goal.keepAllFromLocations?
         for keepFrom in goal.keepAllFromLocations
           @checkArrived(goal.id, keepFrom.keepFromLocation.who , keepFrom.keepFromLocation.targets, e.actor, e.touched.id, frameNumber )
 
@@ -200,7 +200,7 @@ module.exports = class GoalManager extends CocoClass
   initGoalState: (state, whos, progressObjectName) ->
     # 'whos' is an array of goal 'who' values.
     # This inits the progress object for the goal tracking.
-    
+
     arrays = (prop for prop in whos when prop?.length)
     return unless arrays.length
     state[progressObjectName] = {}
@@ -212,6 +212,16 @@ module.exports = class GoalManager extends CocoClass
         else
           state[progressObjectName][thang] = false
 
+  setGoalState: (goalID, status) ->
+    state = @goalStates[goalID]
+    state.status = status
+    if overallStatus = @checkOverallStatus true
+      matchedGoals = (_.find(@goals, {id: goalID}) for goalID, goalState of @goalStates when goalState.status is overallStatus)
+      mostEagerGoal = _.min matchedGoals, 'worldEndsAfter'
+      victory = overallStatus is "success"
+      tentative = overallStatus is "success"
+      @world.endWorld victory, mostEagerGoal.worldEndsAfter, tentative if mostEagerGoal isnt Infinity
+
   updateGoalState: (goalID, thangID, progressObjectName, frameNumber) ->
     # A thang has done something related to the goal!
     # Mark it down and update the goal state.
@@ -226,7 +236,7 @@ module.exports = class GoalManager extends CocoClass
       # saveThangs: by default we would want to save all the Thangs, which means that we would want none of them to be "done"
       numNeeded = _.size(stateThangs) - Math.min((goal.howMany ? 1), _.size stateThangs) + 1
     numDone = _.filter(stateThangs).length
-    #console.log "needed", numNeeded, "done", numDone, "of total", _.size(stateThangs), "with how many", goal.howMany
+    #console.log "needed", numNeeded, "done", numDone, "of total", _.size(stateThangs), "with how many", goal.howMany, "and stateThangs", stateThangs
     return unless numDone >= numNeeded
     return if state.status and not success  # already failed it; don't wipe keyframe
     state.status = if success then "success" else "failure"

app/lib/world/names.coffee

@@ -49,6 +49,8 @@ module.exports.thangNames = thangNames =
     "Stormy"
     "Halle"
     "Sage"
+    "Ryan"
+    "Bond"
   ]
   "Soldier F": [
     "Sarah"
@@ -64,6 +66,7 @@ module.exports.thangNames = thangNames =
     "Lukaz"
     "Gorgin"
     "Coco"
+    "Buffy"
   ]
   "Peasant": [
     "Yorik"
@@ -88,10 +91,12 @@ module.exports.thangNames = thangNames =
     "Gawain"
     "Durfkor"
     "Paps"
+    "Hodor"
   ]
   "Peasant F": [
     "Hilda"
     "Icey"
+    "Matilda"
   ]
   "Archer F": [
     "Phoebe"
@@ -123,6 +128,7 @@ module.exports.thangNames = thangNames =
     "Luna"
     "Alleria"
     "Vereesa"
+    "Beatrice"
   ]
   "Archer M": [
     "Brian"
@@ -143,6 +149,7 @@ module.exports.thangNames = thangNames =
     "Vican"
     "Mars"
     "Dev"
+    "Oliver"
   ]
   "Ogre Munchkin M": [
     "Brack"
@@ -191,6 +198,7 @@ module.exports.thangNames = thangNames =
     "Tarlok"
     "Gurulax"
     "Mokrul"
+    "Polifemo"
   ]
   "Ogre F": [
     "Nareng"
@@ -289,6 +297,7 @@ module.exports.thangNames = thangNames =
     "Amaranth"
     "Zander"
     "Arora"
+    "Curie"
   ]
   "Librarian": [
     "Hushbaum"

app/lib/world/thang.coffee

@@ -38,6 +38,9 @@ module.exports = class Thang
   publishNote: (channel, event) ->
     event.thang = @
     @world.publishNote channel, event
+    
+  setGoalState: (goalID, status) ->
+    @world.setGoalState goalID, status
 
   addComponents: (components...) ->
     # We don't need to keep the components around after attaching them, but we will keep their initial config for recreating Thangs

app/lib/world/world.coffee

@@ -221,6 +221,9 @@ module.exports = class World
       @scriptNotes.push scriptNote
     return unless @goalManager
     @goalManager.submitWorldGenerationEvent(channel, event, @frames.length)
+    
+  setGoalState: (goalID, status) ->
+    @goalManager.setGoalState(goalID, status)
 
   endWorld: (victory=false, delay=3, tentative=false) ->
     @totalFrames = Math.min(@totalFrames, @frames.length + Math.floor(delay / @dt)) - 1  # end a few seconds later

app/locale/ar.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/bg.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "български език", englishDescri
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Затвори"
     okay: "Добре"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "български език", englishDescri
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/ca.coffee

@@ -1,105 +1,113 @@
 module.exports = nativeDescription: "Català", englishDescription: "Catalan", translation:
-#  common:
-#    loading: "Loading..."
-#    saving: "Saving..."
-#    sending: "Sending..."
-#    cancel: "Cancel"
-#    save: "Save"
-#    delay_1_sec: "1 second"
-#    delay_3_sec: "3 seconds"
-#    delay_5_sec: "5 seconds"
-#    manual: "Manual"
-#    fork: "Fork"
-#    play: "Play"
+  common:
+    loading: "Carregant..."
+    saving: "Guardant..."
+    sending: "Enviant..."
+    cancel: "Cancel·lant"
+    save: "Guardar"
+    delay_1_sec: "1 segon"
+    delay_3_sec: "3 segons"
+    delay_5_sec: "5 segons"
+    manual: "Manual"
+    fork: "Fork"
+    play: "Jugar"
 
-#  modal:
-#    close: "Close"
-#    okay: "Okay"
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
+  modal:
+    close: "Tancar"
+    okay: "Okey"
 
 #  not_found:
 #    page_not_found: "Page not found"
 
-#  nav:
-#    play: "Levels"
-#    editor: "Editor"
-#    blog: "Blog"
-#    forum: "Forum"
-#    admin: "Admin"
-#    home: "Home"
-#    contribute: "Contribute"
-#    legal: "Legal"
-#    about: "About"
-#    contact: "Contact"
-#    twitter_follow: "Follow"
-#    employers: "Employers"
+  nav:
+    play: "Nivells"
+    editor: "Editor"
+    blog: "Blog"
+    forum: "Fòrum"
+    admin: "Admin"
+    home: "Inici"
+    contribute: "Col·laborar"
+    legal: "Legalitat"
+    about: "Sobre Nosaltres"
+    contact: "Contacta"
+    twitter_follow: "Segueix-nos"
+    employers: "Treballadors"
 
-#  versions:
-#    save_version_title: "Save New Version"
+  versions:
+    save_version_title: "Guarda una nova versió"
 #    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_prefix: "Per guardar els canvis primer has d'acceptar"
+    cla_url: "CLA"
+    cla_suffix: "."
+    cla_agree: "Estic d'acord"
 
-#  login:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
-#    recover: "recover account"
+  login:
+    sign_up: "Crear un compte"
+    log_in: "Iniciar Sessió"
+    log_out: "Tancar Sessió"
+    recover: "Recuperar un compte"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Recuperar Compte"
+    send_password: "Enviar contrasenya oblidada"
 
-#  signup:
-#    create_account_title: "Create Account to Save Progress"
-#    description: "It's free. Just need a couple things and you'll be good to go:"
-#    email_announcements: "Receive announcements by email"
-#    coppa: "13+ or non-USA "
-#    coppa_why: "(Why?)"
-#    creating: "Creating Account..."
-#    sign_up: "Sign Up"
-#    log_in: "log in with password"
+  signup:
+    create_account_title: "Crear un compte per tal de guardar els progressos"
+    description: "És gratuit. Només calen un parell de coses i ja podràs començar:"
+    email_announcements: "Rebre anuncis via email"
+    coppa: " més de 13 anys o fora dels Estats Units"
+    coppa_why: "(Per què?)"
+    creating: "Creant Compte..."
+    sign_up: "Registrar-se"
+    log_in: "Iniciar sessió amb la teva contrasenya"
 
-#  home:
-#    slogan: "Learn to Code JavaScript by Playing a Game"
-#    no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!"
-#    no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!"
-#    play: "Play"
-#    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
-#    old_browser_suffix: "You can try anyway, but it probably won't work."
-#    campaign: "Campaign"
-#    for_beginners: "For Beginners"
-#    multiplayer: "Multiplayer"
-#    for_developers: "For Developers"
+  home:
+    slogan: "Aprén a programar JavaScript tot Jugant"
+    no_ie: "CodeCombat no funciona en Internet Explorer 9 o versions anteriors. Perdó!"
+    no_mobile: "CodeCombat no ha estat dissenyat per dispositius mòbils i per tant no funcionarà!"
+    play: "Jugar"
+    old_browser: "Uh oh, el teu navegador és massa antic per fer funcionar CodeCombat. Perdó!"
+    old_browser_suffix: "Pots probar-ho igualment, però el més segur és que no funcioni."
+    campaign: "Campanya"
+    for_beginners: "Per a principiants"
+    multiplayer: "Multijugador"
+    for_developers: "Per a Desenvolupadors"
 
-#  play:
-#    choose_your_level: "Choose Your Level"
-#    adventurer_prefix: "You can jump to any level below, or discuss the levels on "
-#    adventurer_forum: "the Adventurer forum"
-#    adventurer_suffix: "."
-#    campaign_beginner: "Beginner Campaign"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
-#    campaign_player_created: "Player-Created"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
-#    play_as: "Play As"
-#    spectate: "Spectate"
+  play:
+    choose_your_level: "Escull el teu nivell"
+    adventurer_prefix: "Pots saltar a qualsevols dels nivells de més abaix, o discutir els nivells de més amunt."
+    adventurer_forum: "El fòrum de l'aventurer"
+    adventurer_suffix: "."
+    campaign_beginner: "Campanya del principiant"
+    campaign_beginner_description: "... on aprens la bruixeria de la programació."
+    campaign_dev: "Nivells difícils aleatoris"
+    campaign_dev_description: "... on aprens a interactuar amb la interfície tot fent coses un pèl més difícils."
+    campaign_multiplayer: "Arenes Multijugador"
+    campaign_multiplayer_description: "... on programes cara a cara contra altres jugadors."
+    campaign_player_created: "Creats pel Jugador"
+    campaign_player_created_description: "... on lluites contra la creativitat dels teus companys <a href=\"/contribute#artisan\">Artisan Wizards</a>."
+    level_difficulty: "Dificultat: "
+    play_as: "Jugar com"
+    spectate: "Spectate"
 
-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
-#    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
-#    forum_suffix: " instead."
-#    send: "Send Feedback"
+  contact:
+    contact_us: "Contacta CodeCombat"
+    welcome: "Què bé poder escoltar-te! Fes servir aquest formulari per enviar-nos un email. "
+    contribute_prefix: "Si estàs interessat en col·laborar, dona un cop d'ull a la nostra "
+    contribute_page: "pàgina de col·laboració"
+    contribute_suffix: "!"
+    forum_prefix: "Per a qualsevol publicació, si us plau prova "
+    forum_page: "el nostre fòrum"
+    forum_suffix: " sinó"
+    send: "Enviar comentari"
 
   diplomat_suggestion:
 #    title: "Help translate CodeCombat!"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/cs.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     fork: "Klonovat"
     play: "Přehrát"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Zavřít"
     okay: "Budiž"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Administrátorský pohled"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/da.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     fork: "Forgren"
     play: "Spil"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Luk"
     okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/de.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    fork: "Fork"
     play: "Abspielen"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Schließen"
     okay: "Okay"
@@ -236,11 +244,27 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+    time_current: "Aktuell"
+    time_total: "Total"
+    time_goto: "Gehe zu"
 
   admin:
     av_title: "Administrator Übersicht"
@@ -561,7 +585,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/el.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Κλείσε"
     okay: "Εντάξει"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/en-AU.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/en-GB.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/en-US.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/en.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     fork: "Fork"
     play: "Play"
 
+  units:
+    second: "second"
+    seconds: "seconds"
+    minute: "minute"
+    minutes: "minutes"
+    hour: "hour"
+    hours: "hours"
+
   modal:
     close: "Close"
     okay: "Okay"
@@ -236,12 +244,27 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     tip_beta_launch: "CodeCombat launched its beta in October, 2013."
     tip_js_beginning: "JavaScript is just the beginning."
     tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+    think_solution: "Think of the solution, not the problem."
+    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+    tip_forums: "Head over to the forums and tell us what you think!"
     tip_baby_coders: "In the future, even babies will be Archmages."
     tip_morale_improves: "Loading will continue until morale improves."
     tip_all_species: "We believe in equal opportunities to learn programming for all species."
     tip_reticulating: "Reticulating spines."
     tip_harry: "Yer a Wizard, "
-    tip_great_responsibility: "With great coding skills comes great debug responsibility."
+    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+    tip_patience: "Patience you must have, young Padawan. - Yoda"
+    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+    time_current: "Now:"
+    time_total: "Max:"
+    time_goto: "Go to:"
 
   admin:
     av_title: "Admin Views"
@@ -563,7 +586,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
 
   multiplayer_launch:
     introducing_dungeon_arena: "Introducing Dungeon Arena"
-    new_way: "March 17, 2014: The new way to compete with code."
+    new_way: "The new way to compete with code."
     to_battle: "To Battle, Developers!"
     modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
     arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/es-419.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Cerrar"
     okay: "OK"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/es-ES.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     fork: "Bifurcar"
     play: "Jugar"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Cerrar"
     okay: "Ok"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/es.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    fork: "Fork"
     play: "Jugar"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Cerrar"
     okay: "OK"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/fa.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    fork: "Fork"
     play: "سطوح"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "بستن"
     okay: "تایید"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/fi.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/fr.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     fork: "Fork"
     play: "Jouer"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Fermer"
     okay: "Ok"
@@ -67,7 +75,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     no_mobile: "CodeCombat n'a pas été créé pour les plateformes mobiles donc il est possible qu'il ne fonctionne pas correctement ! "
     play: "Jouer"
     old_browser: "Oh oh, votre navigateur est trop vieux pour executer CodeCombat. Désolé!"
-    old_browser_suffix: "Vous pouvez essayer quan même, mais celà ne marchera probablement pas."
+    old_browser_suffix: "Vous pouvez essayer quand même, mais celà ne marchera probablement pas."
     campaign: "Campagne"
     for_beginners: "Pour débutants"
     multiplayer: "Multijoueurs"
@@ -83,7 +91,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     campaign_dev: "Niveaux aléatoires plus difficiles"
     campaign_dev_description: "... dans lesquels vous apprendrez à utiliser l'interface en faisant quelque chose d'un petit peu plus dur."
     campaign_multiplayer: "Campagne multi-joueurs"
-    campaign_multiplayer_description: "... dans laquelle vous coderez en face à face contre d'autre joueurs."
+    campaign_multiplayer_description: "... dans laquelle vous coderez en face à face contre d'autres joueurs."
     campaign_player_created: "Niveaux créés par les joueurs"
     campaign_player_created_description: "... Dans laquelle vous serez confrontés à la créativité des votres.<a href=\"/contribute#artisan\">Artisan Wizards</a>."
     level_difficulty: "Difficulté: "
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Vues d'administrateurs"
@@ -350,7 +374,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     nick_description: "Assistant programmeur, mage à la motivation excentrique, et bidouilleur de l'extrême. Nick peut faire n'importe quoi mais il a choisi CodeCombat."
     jeremy_description: "Mage de l'assistance client, testeur de maniabilité, et community manager; vous avez probablement déjà parlé avec Jeremy."
     michael_description: "Programmeur, administrateur réseau, et l'enfant prodige du premier cycle, Michael est la personne qui maintient nos serveurs en ligne."
-#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!"
+    glen_description: "Programmeur et développeur de jeux passioné, avec la motivation pour faire de ce monde un meilleur endroit, en développant des choses qui comptent. Le mot impossible est introuvable dans son dictionnaire. Apprendre de nouveaux talents est sa joie !"
 
   legal:
     page_title: "Légal"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 
   multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/he.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     fork: "קילשון"
     play: "שחק"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "סגור"
     okay: "אישור"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/hi.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/hu.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    fork: "Fork"
     play: "Játék"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Mégse"
     okay: "OK"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/id.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/it.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     fork: "Fork"
     play: "Gioca"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Chiudi"
     okay: "Ok"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Vista amministratore"
@@ -523,7 +547,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     counselor_title: "Consigliere"
     counselor_title_description: "(Esperto/Insegnante)"
 
-#  ladder:
+  ladder:
 #    please_login: "Please log in first before playing a ladder game."
 #    my_matches: "My Matches"
     simulate: "Simula"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/ja.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    fork: "Fork"
     play: "ゲームスタート"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "閉じる"
     okay: "OK"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "管理画面"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/ko.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     fork: "Fork"
     play: "시작"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Close"
     okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "관리자 뷰"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/lt.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/ms.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    fork: "Fork"
     play: "Mula"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Tutup"
     okay: "Ok"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -342,7 +366,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     why_paragraph_3_center: "tapi bersukaria seperti"
     why_paragraph_3_italic_caps: "TIDAK MAK SAYA PERLU HABISKAN LEVEL!"
     why_paragraph_3_suffix: "Itulah kenapa CodeCombat adalah permainan multiplayer, tapi bukan sebuah khursus dibuat sebagai permainan. Kami tidak akan berhenti sehingga kamu tidak akan--tetapi buat masa kini, itulah perkara yang baik."
-    why_paragraph_4: "Jika kamu mahu berasa ketagih terhadap sesuatu permainan komputer, jadilah ketagih kepada permainan ini dan jadilah seorang pakar dalam zaman teknologi terkini."    
+    why_paragraph_4: "Jika kamu mahu berasa ketagih terhadap sesuatu permainan komputer, jadilah ketagih kepada permainan ini dan jadilah seorang pakar dalam zaman teknologi terkini."
     why_ending: "Dan ia adalah percuma! "
     why_ending_url: "Mulalah bermain sekarang!"
 #    george_description: "CEO, business guy, web designer, game designer, and champion of beginning programmers everywhere."
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/nb.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    fork: "Fork"
     play: "Spill"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Lukk"
     okay: "Ok"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/nl-BE.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     fork: "Fork"
     play: "Spelen"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Sluiten"
     okay: "Oké"
@@ -225,6 +233,36 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     editor_config_indentguides_description: "Toon verticale hulplijnen om de zichtbaarheid te verbeteren."
     editor_config_behaviors_label: "Slim gedrag"
     editor_config_behaviors_description: "Auto-aanvulling (gekrulde) haakjes en aanhalingstekens."
+#    loading_ready: "Ready!"
+#    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
+#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
+#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
+#    tip_guide_exists: "Click the guide at the top of the page for useful info."
+#    tip_open_source: "CodeCombat is 100% open source!"
+#    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
+#    tip_js_beginning: "JavaScript is just the beginning."
+#    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
+#    tip_baby_coders: "In the future, even babies will be Archmages."
+#    tip_morale_improves: "Loading will continue until morale improves."
+#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
+#    tip_reticulating: "Reticulating spines."
+#    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Administrator panels"
@@ -235,6 +273,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     av_other_debug_base_url: "Base (om base.jade te debuggen)"
     u_title: "Gebruikerslijst"
     lg_title: "Laatste Spelletjes"
+#    clas: "CLAs"
 
   editor:
     main_title: "CodeCombat Editors"
@@ -515,6 +554,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     simulation_explanation: "Door spellen te simuleren kan je zelf sneller beoordeeld worden!"
     simulate_games: "Simuleer spellen!"
     simulate_all: "RESET EN SIMULEER SPELLEN"
+#    games_simulated_by: "Games simulated by you:"
+#    games_simulated_for: "Games simulated for you:"
     leaderboard: "Leaderboard"
     battle_as: "Vecht als "
     summary_your: "Jouw "
@@ -542,7 +583,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 
   multiplayer_launch:
     introducing_dungeon_arena: "Introductie van Dungeon Arena"
-    new_way: "17 maart, 2014: De nieuwe manier om te concurreren met code."
+    new_way: "De nieuwe manier om te concurreren met code."
     to_battle: "Naar het slagveld, ontwikkelaars!"
     modern_day_sorcerer: "Kan jij programmeren? Hoe stoer is dat. Jij bent een modere voetballer! is het niet tijd dat je jouw magische krachten gebruikt voor het controlleren van jou minions in het slagveld? En nee, we praten heir niet over robots."
     arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/nl-NL.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     fork: "Fork"
     play: "Spelen"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Sluiten"
     okay: "Oké"
@@ -225,6 +233,36 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     editor_config_indentguides_description: "Toon verticale hulplijnen om de zichtbaarheid te verbeteren."
     editor_config_behaviors_label: "Slim gedrag"
     editor_config_behaviors_description: "Auto-aanvulling (gekrulde) haakjes en aanhalingstekens."
+#    loading_ready: "Ready!"
+#    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
+#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
+#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
+#    tip_guide_exists: "Click the guide at the top of the page for useful info."
+#    tip_open_source: "CodeCombat is 100% open source!"
+#    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
+#    tip_js_beginning: "JavaScript is just the beginning."
+#    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
+#    tip_baby_coders: "In the future, even babies will be Archmages."
+#    tip_morale_improves: "Loading will continue until morale improves."
+#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
+#    tip_reticulating: "Reticulating spines."
+#    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Administrator panels"
@@ -235,6 +273,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     av_other_debug_base_url: "Base (om base.jade te debuggen)"
     u_title: "Gebruikerslijst"
     lg_title: "Laatste Spelletjes"
+#    clas: "CLAs"
 
   editor:
     main_title: "CodeCombat Editors"
@@ -515,6 +554,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     simulation_explanation: "Door spellen te simuleren kan je zelf sneller beoordeeld worden!"
     simulate_games: "Simuleer spellen!"
     simulate_all: "RESET EN SIMULEER SPELLEN"
+#    games_simulated_by: "Games simulated by you:"
+#    games_simulated_for: "Games simulated for you:"
     leaderboard: "Leaderboard"
     battle_as: "Vecht als "
     summary_your: "Jouw "
@@ -542,7 +583,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 
   multiplayer_launch:
     introducing_dungeon_arena: "Introductie van Dungeon Arena"
-    new_way: "17 maart, 2014: De nieuwe manier om te concurreren met code."
+    new_way: "De nieuwe manier om te concurreren met code."
     to_battle: "Naar het slagveld, ontwikkelaars!"
     modern_day_sorcerer: "Kan jij programmeren? Hoe stoer is dat. Jij bent een modere voetballer! is het niet tijd dat je jouw magische krachten gebruikt voor het controlleren van jou minions in het slagveld? En nee, we praten heir niet over robots."
     arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/nl.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     fork: "Fork"
     play: "Spelen"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Sluiten"
     okay: "Oké"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     tip_beta_launch: "CodeCombat lanceerde zijn beta versie in Oktober, 2013."
     tip_js_beginning: "JavaScript is nog maar het begin."
     tip_autocast_setting: "Verander de autocast instelling door te klikken op het tandwiel naast de cast knop."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
     tip_baby_coders: "Zelfs babies zullen in de toekomst een Tovenaar zijn."
     tip_morale_improves: "Het spel zal blijven laden tot de moreel verbeterd."
     tip_all_species: "Wij geloven in gelijke kansen voor alle wezens om te leren programmeren."
-# tip_reticulating: "Reticulating spines."
+#    tip_reticulating: "Reticulating spines."
     tip_harry: "Je bent een tovenaar, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Administrator panels"

app/locale/nn.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/no.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    fork: "Fork"
     play: "Spill"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Lukk"
     okay: "Ok"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/pl.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     fork: "Fork"
     play: "Graj"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Zamknij"
     okay: "OK"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Panel administracyjny"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 
   multiplayer_launch:
     introducing_dungeon_arena: "Oto Dungeon Arena"
-    new_way: "17. marca 2014: Nowy sposób, by współzawodniczyć dzięki programowaniu."
+    new_way: "Nowy sposób, by współzawodniczyć dzięki programowaniu."
     to_battle: "Do broni, developerzy!"
     modern_day_sorcerer: "Wiesz, jak programować? Super. Jesteś współczesnym czarodziejem. Czy nie najwyższy czas, aby użyć swoich mocy, by dowodzić jednostkami w epickiej batalii? I nie mamy tutaj na myśli robotów."
     arenas_are_here: "Areny wieloosobowych potyczek CodeCombat właśnie nastały."

app/locale/pt-BR.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     fork: "Fork"
     play: "Jogar"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Fechar"
     okay: "Ok"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Visualização de Administrador"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 
   multiplayer_launch:
     introducing_dungeon_arena: "Introduzindo a Dungeon Arena"
-    new_way: "17 de Março de 2014: O novo meio de competir com código."
+    new_way: "O novo meio de competir com código."
     to_battle: "Para a Batalha, Desenvolvedores!"
     modern_day_sorcerer: "Você sabe como codificar? Isso é incrível. Você é um feiticeiro dos tempos modernos! Não é tempo de usar seus poderes mágicos de codificação para comandar seus lacaios em um combate épico? E não estamos falando de robôs aqui."
     arenas_are_here: "As arenas de combatte um contra um do CodeCombat estão aqui."

app/locale/pt-PT.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     fork: "Fork"
     play: "Jogar"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Fechar"
     okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Visualizações de Admin"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
 
   multiplayer_launch:
     introducing_dungeon_arena: "Introduzindo a Dungeon Arena"
-    new_way: "17 de Março de 2014: Uma nova forma de competir com código."
+    new_way: "Uma nova forma de competir com código."
     to_battle: "Às armas, Programadores!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
     arenas_are_here: "As arenas mano-a-mano multiplayer de CodeCombat estão aqui."

app/locale/pt.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    fork: "Fork"
     play: "Jogar"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Fechar"
     okay: "Ok"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/ro.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     fork: "Fork"
     play: "Joacă"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Inchide"
     okay: "Okay"
@@ -218,12 +226,12 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     editor_config_title: "Configurare Editor"
     editor_config_keybindings_label: "Mapare taste"
     editor_config_keybindings_default: "Default (Ace)"
-    editor_config_keybindings_description: "Adaugă comenzi rapide suplimentare cunoscute din editoarele obisnuite." # not sure, where is this on the site?
+    editor_config_keybindings_description: "Adaugă comenzi rapide suplimentare cunoscute din editoarele obisnuite."
     editor_config_invisibles_label: "Arată etichetele invizibile"
     editor_config_invisibles_description: "Arată spațiile și taburile invizibile."
     editor_config_indentguides_label: "Arată ghidul de indentare"
     editor_config_indentguides_description: "Arată linii verticale pentru a vedea mai bine indentarea."
-    editor_config_behaviors_label: "Comportamente inteligente"  # context?
+    editor_config_behaviors_label: "Comportamente inteligente"
     editor_config_behaviors_description: "Completează automat parantezele, ghilimele etc."
     loading_ready: "Gata!"
     tip_insert_positions: "Shift+Click oriunde pe harta pentru a insera punctul în editorul de vrăji."
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     tip_beta_launch: "CodeCombat a fost lansat beta in Octombrie 2013."
     tip_js_beginning: "JavaScript este doar începutul."
     tip_autocast_setting: "Ajutează setările de autocast apăsând pe rotița de pe buton."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
     tip_baby_coders: "În vitor până și bebelușii vor fi Archmage."
     tip_morale_improves: "Se va încărca până până când va crește moralul."
     tip_all_species: "Noi credem în șanse egale de a învăța programare pentru toate speciile."
-#    tip_reticulating: "Reticulating spines."  ??????????context ???
+#    tip_reticulating: "Reticulating spines."
     tip_harry: "Ha un Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Admin vede"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/ru.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     fork: "Форк"
     play: "Играть"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Закрыть"
     okay: "OK"
@@ -53,7 +61,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 
   signup:
     create_account_title: "Создать аккаунт, чтобы сохранить прогресс"
-    description: "Это бесплатно. Нужна лишь пара вещей и вы сможете продолжить путешествие:"
+    description: "Это бесплатно. Нужна лишь пара вещей, и вы сможете продолжить путешествие:"
     email_announcements: "Получать оповещения на email"
     coppa: "Вы старше 13 лет или живёте не в США "
     coppa_why: "(почему?)"
@@ -231,14 +239,30 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tip_scrub_shortcut: "Ctrl+[ и Ctrl+] - перемотка назад и вперёд."
     tip_guide_exists: "Щёлкните \"руководство\" наверху страницы для получения полезной информации."
     tip_open_source: "Исходный код CodeCombat открыт на 100%!"
-    tip_beta_launch: "CodeCombat запустил бета-тестирование в октябре 2013."
+    tip_beta_launch: "CodeCombat запустил бета-тестирование в октябре 2013 года."
     tip_js_beginning: "JavaScript это только начало."
     tip_autocast_setting: "Изменяйте настройки авточтения заклинания, щёлкнув по шестерёнке на кнопке прочтения."
+    think_solution: "Думайте о решении, а не о проблеме."
+    tip_theory_practice: "В теории, между практикой и теорией нет разницы. Но на практике есть. - Yogi Berra"
+    tip_error_free: "Есть два способа писать программы без ошибок; работает только третий. - Alan Perlis"
+    tip_debugging_program: "Если отладка это процесс удаления багов, то программирование должно быть процессом их добавления. - Edsger W. Dijkstra"
+    tip_forums: "Заходите на форумы и расскажите нам, что вы думаете!"
     tip_baby_coders: "В будущем, даже младенцы будут Архимагами."
-    tip_morale_improves: "Загрузка будет продолжаться, пока боевой дух не улучшится."
-    tip_all_species: "Мы верим в равные возможности для обучения программированию для всех видов."
+    tip_morale_improves: "Загрузка будет продолжаться, пока боевой дух не восстановится."
+    tip_all_species: "Мы верим в равные возможности для обучения программированию, для всех видов."
     tip_reticulating: "Ретикуляция сплайнов."
     tip_harry: "Ты волшебник, "
+    tip_great_responsibility: "С большим умением программирования приходит большая ответственность отладки."
+    tip_munchkin: "Если вы не съедите овощи, манчкин придёт за вами, пока вы спите."
+    tip_binary: "В мире есть 10 типов людей: те, кто понимают двоичную систему счисления и те, кто не понимают."
+    tip_commitment_yoda: "Программист верностью принципам обладать должен, и серьёзным умом. ~ Yoda"
+    tip_no_try: "Делай. Или не делай. Не надо пытаться. - Yoda"
+    tip_patience: "Терпением ты обладать должен, юный падаван. - Yoda"
+    tip_documented_bug: "Документированный баг не является багом; это фича."
+    tip_impossible: "Это всегда кажется невозможным, пока не сделано. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Админ панель"
@@ -481,7 +505,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     diplomat_attribute_1: "Свободное владение английским языком и языком, на который вы хотели бы переводить. При передаче сложных идей важно иметь сильную хватку в обоих!"
     diplomat_join_pref_github: "Найдите файл локализации вашего языка "
     diplomat_github_url: "на GitHub"
-    diplomat_join_suf_github: ", отредактируйте его онлайн и отправьте запрос на включение изменений. Кроме того, установите флажок ниже, чтобы быть в курсе новых разработок интернационализации!"
+    diplomat_join_suf_github: ", отредактируйте его онлайн и отправьте запрос на подтверждение изменений. Кроме того, установите флажок ниже, чтобы быть в курсе новых разработок интернационализации!"
     more_about_diplomat: "Узнать больше о том, как стать Дипломатом"
     diplomat_subscribe_desc: "Получать email-ы о i18n разработках и уровнях для перевода."
     ambassador_summary: "Мы пытаемся создать сообщество, и каждое сообщество нуждается в службе поддержки, когда есть проблемы. У нас есть чаты, электронная почта и социальные сети, чтобы наши пользователи могли познакомиться с игрой. Если вы хотите помочь людям втянуться, получать удовольствие и учиться программированию, этот класс для вас."
@@ -559,14 +583,14 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 
   multiplayer_launch:
     introducing_dungeon_arena: "Представляем Арену подземелья"
-    new_way: "17 марта 2014: Новый способ соревноваться с помощью кода."
+    new_way: "Новый способ соревноваться с помощью кода."
     to_battle: "В бой, разработчики!"
     modern_day_sorcerer: "Вы знаете, как программировать? Это круто. Вы волшебник наших дней! Разве не время, чтобы вы использовали свои магические силы программирования для управления миньонами в эпичной битве? И мы не говорим здесь роботы."
     arenas_are_here: "Мультиплеерные арены CodeCombat на равных уже здесь."
-    ladder_explanation: "Выбирайте своих героев, зачаровывайте свои армии людей или огров, и взберитесь через поверженных коллег-Волшебников на вершину ладдеров–затем бросьте вызов своим друзьям в наших славных, асинхронно-мультиплеерных аренах прогрммирования. Если вы ощущаете себя творческим, можете даже"
-    fork_our_arenas: "сделать форк наших арен"
+    ladder_explanation: "Выбирайте своих героев, зачаровывайте свои армии людей или огров, и взберитесь через поверженных коллег-Волшебников на вершину ладдеров – затем бросьте вызов своим друзьям в наших славных, асинхронно-мультиплеерных аренах прогрммирования. Если вы ощущаете себя творческим, можете даже"
+    fork_our_arenas: "сделать модификации наших арен"
     create_worlds: "и создавать свои собственные миры."
     javascript_rusty: "Подзабыли JavaScript? Не беспокойтесь; есть"
     tutorial: "обучение"
     new_to_programming: ". Новичок в программировании? Пройдите нашу кампанию для новичков, чтобы повысить навык."
-    so_ready: "Я полностью готов для этого"
+    so_ready: "Я полностью готов(а) для этого"

app/locale/sk.coffee

@@ -1,94 +1,102 @@
 module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", translation:
   common:
     loading: "Načítava sa..."
-#    saving: "Saving..."
+    saving: "Ukladá sa..."
     sending: "Odosiela sa..."
-    cancel: "Zrušiť"
-#    save: "Save"
-#    delay_1_sec: "1 second"
-#    delay_3_sec: "3 seconds"
-#    delay_5_sec: "5 seconds"
-#    manual: "Manual"
+    cancel: "Zruš"
+    save: "Ulož"
+    delay_1_sec: "1 sekunda"
+    delay_3_sec: "3 sekundy"
+    delay_5_sec: "5 sekúnd"
+    manual: "Manuál"
 #    fork: "Fork"
-    play: "Hrať"
+    play: "Hraj"
+
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
 
   modal:
-    close: "Zatvoriť"
+    close: "Zatvor"
     okay: "Súhlasím"
 
   not_found:
     page_not_found: "Stránka nenájdená"
 
   nav:
-    play: "Hrať"
+    play: "Hraj"
     editor: "Editor"
     blog: "Blog"
     forum: "Fórum"
-    admin: "Administrácia"
+    admin: "Spravuj"
     home: "Domov"
-    contribute: "Prispieť"
-#    legal: "Legal"
+    contribute: "Prispej"
+    legal: "Pre právnikov"
     about: "O projekte"
     contact: "Kontakt"
-    twitter_follow: "Sledovať"
-#    employers: "Employers"
+    twitter_follow: "Sleduj na twitteri"
+    employers: "Zamestnávatelia"
 
-#  versions:
-#    save_version_title: "Save New Version"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
+  versions:
+    save_version_title: "Ulož novú verziu"
+    new_major_version: "Nová primárna verzia"
+    cla_prefix: "Ak chcete uložiť svoje zmeny, musíte najprv súhlasiť s našou"
 #    cla_url: "CLA"
 #    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_agree: "SÚHLASÍM"
 
   login:
-    sign_up: "Vytvoriť účet"
-    log_in: "Prihlásiť sa"
-    log_out: "Odhlásiť sa"
-    recover: "obnoviť účet"
+    sign_up: "Vytvor účet"
+    log_in: "Prihlás sa"
+    log_out: "Odhlás sa"
+    recover: "obnov"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Obnov účet"
+    send_password: "Zašli záchranné heslo"
 
   signup:
-#    create_account_title: "Create Account to Save Progress"
-    description: "Je to zdarma. Potrebuješ zadať len zopár detailov."
-    email_announcements: "Dostávať správy na email."
+    create_account_title: "Vytvor si účet, nech si uložíš progres"
+    description: "Je to zdarma. Len treba zadať zopár detailov."
+    email_announcements: "Chcem dostávať správy na email."
     coppa: "13+ alebo mimo USA"
     coppa_why: "(Prečo?)"
     creating: "Vytvára sa účet..."
-    sign_up: "Registrovať sa"
-    log_in: "prihlásiť sa pomocou hesla"
+    sign_up: "Registruj sa"
+    log_in: "prihlás sa pomocou hesla"
 
   home:
-    slogan: "Naučte sa programovať v Javascripte pomocou hry"
+    slogan: "Nauč sa programovať v Javascripte pomocou hry"
     no_ie: "CodeCombat nefunguje v prehliadači Internet Explorer 9 a jeho starších verziách. Ospravedlňujeme sa."
     no_mobile: "CodeCombat nebol navrhnutý pre mobilné zariadenia a nemusí na nich fungovať správne!"
-    play: "Hrať"
-#    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
-#    old_browser_suffix: "You can try anyway, but it probably won't work."
-#    campaign: "Campaign"
-#    for_beginners: "For Beginners"
+    play: "Hraj"
+    old_browser: "Ajaj, prehliadač je príliš starý. CodeCombat na ňom nepôjde. Je nám to ľúto!"
+    old_browser_suffix: "Skúsiť sa to dá, ale asi to nepôjde."
+    campaign: "Ťaženie"
+    for_beginners: "Pre začiatočníkov"
 #    multiplayer: "Multiplayer"
-#    for_developers: "For Developers"
+    for_developers: "Pre vývojárov"
 
   play:
-    choose_your_level: "Vyber si level"
-    adventurer_prefix: "Môže si vybrať ktorýkoľvek z levelov alebo ich prediskutovať na "
+    choose_your_level: "Vyber si úroveň"
+    adventurer_prefix: "Môže si vybrať ktorúkoľvek z úrovní alebo ich prediskutovať na "
     adventurer_forum: "fóre pre dobrodruhov"
     adventurer_suffix: "."
     campaign_beginner: "Ťaženie pre začiatočníkov"
-    campaign_beginner_description: "... v kotorom sa naučíte mágiu programovania."
-    campaign_dev: "Náhodné ťažšie levely"
-    campaign_dev_description: "... v ktorom sa naučíte používať rozhranie zatiaľčo budete čeliť väčším výzvam."
+    campaign_beginner_description: "... v ktorom sa naučíš mágiu programovania."
+    campaign_dev: "Náhodné ťažšie úrovne"
+    campaign_dev_description: "... v ktorych sa naučíš používať rozhranie a čeliť väčším výzvam."
     campaign_multiplayer: "Aréna pre viacerých hráčov"
-    campaign_multiplayer_description: "... v ktorej si zmeriate svoje programátorské sily proti ostatným hráčom."
-    campaign_player_created: "Hráčmi vytvorené levely"
-    campaign_player_created_description: "... v ktorých sa popasujete s kreativitou svojich <a href=\"/contribute#artisan\">súdruhov kúzelníkov</a>."
+    campaign_multiplayer_description: "... v ktorej si zmeriaš svoje programátorské sily proti ostatným hráčom."
+    campaign_player_created: "Hráčmi vytvorené úrovne"
+    campaign_player_created_description: "... v ktorých sa popasuješ s kreativitou svojich <a href=\"/contribute#artisan\">kúzelníckych súdruhov</a>."
     level_difficulty: "Obtiažnosť."
-#    play_as: "Play As"
-#    spectate: "Spectate"
+    play_as: "Hraj ako"
+    spectate: "Sleduj"
 
   contact:
     contact_us: "Kontaktujte nás"
@@ -109,34 +117,34 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    learn_more: "Learn more about being a Diplomat"
 #    subscribe_as_diplomat: "Subscribe as a Diplomat"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
-#    clothes: "Clothes"
-#    trim: "Trim"
-#    cloud: "Cloud"
-#    spell: "Spell"
-#    boots: "Boots"
-#    hue: "Hue"
-#    saturation: "Saturation"
-#    lightness: "Lightness"
+  wizard_settings:
+    title: "Nastavenia kúzelníka"
+    customize_avatar: "Uprav svojho avatara"
+    clothes: "Róba"
+    trim: "Lem"
+    cloud: "Obláčik"
+    spell: "Kúzlo"
+    boots: "Čižmy"
+    hue: "Odtieň"
+    saturation: "Sýtosť"
+    lightness: "Jas"
 
-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
-#    me_tab: "Me"
-#    picture_tab: "Picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
-#    admin: "Admin"
-#    gravatar_select: "Select which Gravatar photo to use"
+  account_settings:
+    title: "Nastvenia účtu"
+    not_logged_in: "Prihlás sa alebo si vytvor účet."
+    autosave: "Zmeny sa uložia automaticky"
+    me_tab: "Ja"
+    picture_tab: "Obrázok"
+    wizard_tab: "Kúzelník"
+    password_tab: "Heslo"
+    emails_tab: "E-maily"
+    admin: "Spravovať"
+    gravatar_select: " Vyber ktorú fotografiu z Gravataru použit"
 #    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
 #    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
+    wizard_color: "Farba kúzelníckej róby"
+    new_password: "Nové heslo"
+    new_password_verify: "Overenie"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
 #    email_notifications: "Notifications"
@@ -147,9 +155,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    error_saving: "Error Saving"
-#    saved: "Changes Saved"
-#    password_mismatch: "Password does not match."
+    error_saving: "Chyba pri ukladaní"
+    saved: "Zmeny uložené"
+    password_mismatch: "Heslá nesedia."
 
 #  account_profile:
 #    edit_settings: "Edit Settings"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/sl.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/sr.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    fork: "Fork"
     play: "Нивои"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Затвори"
     okay: "ОК"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/sv.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     fork: "Förgrena"
     play: "Spela"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Stäng"
     okay: "Okej"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Administratörsvyer"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 
   multiplayer_launch:
     introducing_dungeon_arena: "Introducerar grottarenan"
-    new_way: "17 mars 2014: Det nya sättet att tävla i kod."
+    new_way: "Det nya sättet att tävla i kod."
     to_battle: "Till slagfältet, utvecklare!"
     modern_day_sorcerer: "Du vet hur man kodar? Det är coolt. Du är en modern trollkarl! Är det inte dags att du använde dina magiska kodarkrafter för att leda dina undersåtar i episka strider? Och vi snackar inte om robotar nu."
     arenas_are_here: "CodeCombats flerspelararenor är här."

app/locale/th.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    fork: "Fork"
     play: "เล่น"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "ปิด"
     okay: "ตกลง"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/tr.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     fork: "Çatalla"
     play: "Oyna"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Kapat"
     okay: "Tamam"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "Yönetici Görünümleri"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/uk.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "українська мова", englishDesc
     fork: "Форк"
     play: "Грати"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Закрити"
     okay: "Добре"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/ur.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    fork: "Fork"
 #    play: "Play"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
 #  modal:
 #    close: "Close"
 #    okay: "Okay"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/vi.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    fork: "Fork"
     play: "Các cấp độ"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "Đóng"
     okay: "Được rồi"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -421,7 +445,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    introduction_desc_github_url: "CodeCombat is totally open source"
 #    introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours."
 #    introduction_desc_ending: "We hope you'll join our party!"
-#    introduction_desc_signature: "- Nick, George, Scott, Michael, ,Jeremy and Glen"
+#    introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen"
 #    alert_account_message_intro: "Hey there!"
 #    alert_account_message_pref: "To subscribe for class emails, you'll need to "
 #    alert_account_message_suf: "first."
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/zh-HANS.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     fork: "派生"
     play: "开始"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "关闭"
     okay: "好的"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
   admin:
     av_title: "管理员视图"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/zh-HANT.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     fork: "Fork"
     play: "播放"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "關閉"
     okay: "好"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/locale/zh.coffee

@@ -12,6 +12,14 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     fork: "Fork"
     play: "玩"
 
+#  units:
+#    second: "second"
+#    seconds: "seconds"
+#    minute: "minute"
+#    minutes: "minutes"
+#    hour: "hour"
+#    hours: "hours"
+
   modal:
     close: "关闭"
     okay: "好"
@@ -234,11 +242,27 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
+#    think_solution: "Think of the solution, not the problem."
+#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+#    tip_forums: "Head over to the forums and tell us what you think!"
 #    tip_baby_coders: "In the future, even babies will be Archmages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
+#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
+#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
+#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
+#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
+#    tip_patience: "Patience you must have, young Padawan. - Yoda"
+#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
+#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+#    time_current: "Now:"
+#    time_total: "Max:"
+#    time_goto: "Go to:"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -559,7 +583,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 
 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "March 17, 2014: The new way to compete with code."
+#    new_way: "The new way to compete with code."
 #    to_battle: "To Battle, Developers!"
 #    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
 #    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."

app/styles/base.sass

@@ -1,5 +1,6 @@
 @import "bootstrap/variables"
 @import "bootstrap/mixins"
+@import "bootstrap/variables"
 
 html
   background-color: #2f261d
@@ -191,3 +192,21 @@ table.table
 
 .flag-cursor
   cursor: crosshair
+
+
+// Fonts
+
+.header-font
+  font-family: $headings-font-family
+
+body[lang='ru'], body[lang|='zh'], body[lang='ja'], body[lang='pl'], body[lang='tr'], body[lang='cs'], body[lang='el'], body[lang='ro'], body[lang='vi'], body[lang='th'], body[lang='ko'], body[lang='sk'], body[lang='sl'], body[lang='bg'], body[lang='he'], body[lang='lt'], body[lang='sr'], body[lang='uk'], body[lang='hi'], body[lang='ur'], 
+  h1, h2, h3, h4, h5, h6
+    font-family: 'Open Sans Condensed', Impact, "Arial Narrow", "Arial", sans-serif
+    text-transform: uppercase
+    letter-spacing: -1px !important
+    
+  .header-font
+    font-family: 'Open Sans Condensed', Impact, "Arial Narrow", "Arial", sans-serif !important
+    text-transform: uppercase
+    letter-spacing: -1px !important
+   

app/styles/bootstrap/_bootswatch.scss

@@ -7,6 +7,7 @@
 // -----------------------------------------------------
 
 @import url(//fonts.googleapis.com/css?family=Bangers);
+@import url(//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,latin-ext,cyrillic-ext,greek-ext,greek,vietnamese,cyrillic);
 
 // SCAFFOLDING
 // -----------------------------------------------------

app/styles/common/top_nav.sass

@@ -6,7 +6,6 @@
     margin-left: -20px
 
   .navbuttontext, .fancy-select .trigger
-    font-family: 'Bangers', cursive
     font-size: 20px
     font-weight: 400
     letter-spacing: 1px
@@ -22,7 +21,6 @@
     height: 18px
 
   .nav.navbar-link-text, .nav.navbar-link-text > li > a
-    font-family: 'Bangers', cursive
     font-weight: normal
     font-size: 25px
     letter-spacing: 2px

app/templates/base.jade

@@ -10,28 +10,28 @@ body
         select.language-dropdown
 
         if me.get('anonymous') === false
-          button.btn.btn-primary.navbuttontext#logout-button(data-i18n="login.log_out") Log Out
-          a.btn.btn-primary.navbuttontext(href="/account/profile/#{me.id}")
+          button.btn.btn-primary.navbuttontext.header-font#logout-button(data-i18n="login.log_out") Log Out
+          a.btn.btn-primary.navbuttontext.header-font(href="/account/profile/#{me.id}")
             div.navbuttontext-user-name
               | #{me.displayName()}
             i.icon-cog.icon-white.big
 
         else
-          button.btn.btn-primary.navbuttontext(data-toggle="coco-modal", data-target="modal/signup", data-i18n="login.sign_up") Create Account
-          button.btn.btn-primary.navbuttontext(data-toggle="coco-modal", data-target="modal/login", data-i18n="login.log_in") Log In
+          button.btn.btn-primary.navbuttontext.header-font(data-toggle="coco-modal", data-target="modal/signup", data-i18n="login.sign_up") Create Account
+          button.btn.btn-primary.navbuttontext.header-font(data-toggle="coco-modal", data-target="modal/login", data-i18n="login.log_in") Log In
 
         ul(class='navbar-link-text').nav.navbar-nav.pull-right
           li.play
-            a(href='/play', data-i18n="nav.navbar-nav.play") Levels
+            a.header-font(href='/play', data-i18n="nav.navbar-nav.play") Levels
           li.editor
-            a(href='/editor', data-i18n="nav.navbar-nav.editor") Editor
+            a.header-font(href='/editor', data-i18n="nav.navbar-nav.editor") Editor
           li.blog
-            a(href='http://blog.codecombat.com/', data-i18n="nav.navbar-nav.blog") Blog
+            a.header-font(href='http://blog.codecombat.com/', data-i18n="nav.navbar-nav.blog") Blog
           li.forum
-            a(href='http://discourse.codecombat.com/', data-i18n="nav.navbar-nav.forum") Forum
+            a.header-font(href='http://discourse.codecombat.com/', data-i18n="nav.navbar-nav.forum") Forum
           if me.isAdmin()
             li.admin
-              a(href='/admin', data-i18n="nav.navbar-nav.admin") Admin
+              a.header-font(href='/admin', data-i18n="nav.navbar-nav.admin") Admin
 
   block outer_content
     #outer-content-wrapper

app/templates/editor/article/edit.jade

@@ -18,10 +18,12 @@ block content
   h3(data-i18n="article.edit_article_title") Edit Article
     span
      |: "#{article.attributes.name}"
-  
+
   #article-treema
     
   #article-view
   
   hr
 
+  div#error-view
+

app/templates/editor/level/add_thangs.jade

@@ -1,5 +1,5 @@
 h3(data-i18n="editor.level_tab_thangs_add") Add Thangs
-input(type="text", id="thang-search")
+input(type="search", id="thang-search")
 #thangs-list
   for group in groups
     h4= group.name

app/templates/editor/level/edit.jade

@@ -75,4 +75,6 @@ block outer_content
 
       div.tab-pane#editor-level-systems-tab-view
 
+    div#error-view
+
 block footer

app/templates/editor/thang/edit.jade

@@ -84,4 +84,6 @@ block content
       
       div#spritesheets
 
+  div#error-view
+
   .clearfix

app/templates/error.jade

@@ -0,0 +1,3 @@
+div.alert.alert-warning
+  h2
+    span(data-i18n="common.error") Error: Failed to process request.

app/templates/multiplayer_launch_modal.jade

@@ -2,7 +2,7 @@ extends /templates/modal/modal_base
 
 block modal-header-content
   h1(data-i18n="multiplayer_launch.introducing_dungeon_arena") Introducing Dungeon Arena
-  em(data-i18n="multiplayer_launch.new_way") March 17, 2014: The new way to compete with code.
+  em(data-i18n="multiplayer_launch.new_way") The new way to compete with code.
 
 block modal-body-content
 

app/templates/play/level/level_loading.jade

@@ -17,12 +17,24 @@
     strong.tip(data-i18n='play_level.tip_beta_launch') CodeCombat launched its beta in October, 2013.
     strong.tip(data-i18n='play_level.tip_js_beginning') JavaScript is just the beginning.
     strong.tip(data-i18n='play_level.tip_autocast_setting') Adjust autocast settings by clicking the gear on the cast button.
+    strong.tip(data-i18n='play_level.tip_think_solution') Think of the solution, not the problem.
+    strong.tip(data-i18n='play_level.tip_theory_practice') In theory there is no difference between theory and practice; in practice there is. - Yogi Berra
+    strong.tip(data-i18n='play_level.tip_error_free') There are two ways to write error-free programs; only the third one works. - Alan Perlis
+    strong.tip(data-i18n='play_level.tip_debugging_program') If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra
+    strong.tip(data-i18n='play_level.tip_forums') Head over to the forums and tell us what you think!
+    strong.tip(data-i18n='play_level.tip_impossible') It always seems impossible until it's done. - Nelson Mandela
 
     strong.tip.rare(data-i18n='play_level.tip_baby_coders') In the future, even babies will be Archmages.
     strong.tip.rare(data-i18n='play_level.tip_morale_improves') Loading will continue until morale improves.
     strong.tip.rare(data-i18n='play_level.tip_all_species') We believe in equal opportunities to learn programming for all species.
     strong.tip.rare(data-i18n='play_level.tip_reticulating') Reticulating spines.
-    strong.tip.rare(data-i18n='play_level.tip_great_responsibility') With great coding skills comes great debug responsibility.
+    strong.tip.rare(data-i18n='play_level.tip_great_responsibility') With great coding skill comes great debug responsibility.
+    strong.tip.rare(data-i18n='play_level.tip_munchkin') If you don't eat your vegetables, a munchkin will come after you while you're asleep.
+    strong.tip.rare(data-i18n='play_level.tip_binary') There are only 10 types of people in the world: those who understand binary, and those who don't.
+    strong.tip.rare(data-i18n='play_level.tip_commitment_yoda') A programmer must have the deepest commitment, the most serious mind. ~ Yoda
+    strong.tip.rare(data-i18n='play_level.tip_no_try') Do. Or do not. There is no try. - Yoda
+    strong.tip.rare(data-i18n='play_level.tip_patience') Patience you must have, young Padawan. - Yoda
+    strong.tip.rare(data-i18n='play_level.tip_documented_bug') A documented bug is not a bug; it is a feature.
     strong.tip.rare
       span(data-i18n='play_level.tip_harry') Yer a Wizard, 
       span= me.get('name') || 'Anoner'

app/templates/play/level/playback.jade

@@ -11,10 +11,14 @@ button.btn.btn-xs.btn-inverse#music-button(title="Toggle Music")
   span ♫
 
 .scrubber
-  .progress.secret
+  .progress.secret#timeProgress
     .progress-bar
       .scrubber-handle
-  
+      .popover.fade.top.in#timePopover
+        .arrow
+        h3.popover-title
+        .popover-content
+
 .btn-group.dropup#playback-settings
   button.btn.btn-xs.btn-inverse.toggle-fullscreen(title="Toggle fullscreen")
     i.icon-fullscreen.icon-white

app/views/editor/article/edit.coffee

@@ -1,5 +1,6 @@
 View = require 'views/kinds/RootView'
 VersionHistoryView = require './versions_view'
+ErrorView = require '../../error_view'
 template = require 'templates/editor/article/edit'
 Article = require 'models/Article'
 
@@ -19,6 +20,18 @@ module.exports = class ArticleEditView extends View
     super options
     @article = new Article(_id: @articleID)
     @article.saveBackups = true
+
+    @listenToOnce(@article, 'error', 
+      () => 
+        @hideLoading()
+
+        # Hack: editor components appear after calling insertSubView.
+        # So we need to hide them first. 
+        $(@$el).find('.main-content-area').children('*').not('#error-view').remove()
+
+        @insertSubView(new ErrorView())
+    )
+
     @article.fetch()
     @listenToOnce(@article, 'sync', @onArticleSync)
     @listenTo(@article, 'schema-loaded', @buildTreema)

app/views/editor/level/edit.coffee

@@ -13,6 +13,7 @@ SystemsTabView = require './systems_tab_view'
 LevelSaveView = require './save_view'
 LevelForkView = require './fork_view'
 VersionHistoryView = require './versions_view'
+ErrorView = require '../../error_view'
 
 module.exports = class EditorLevelView extends View
   id: "editor-level-view"
@@ -43,6 +44,12 @@ module.exports = class EditorLevelView extends View
 
     @level = new Level _id: @levelID
     @listenToOnce(@level, 'sync', @onLevelLoaded)
+
+    @listenToOnce(@supermodel, 'error', 
+      () => 
+        @hideLoading()
+        @insertSubView(new ErrorView())
+    )
     @supermodel.populateModel @level
 
   showLoading: ($el) ->

app/views/editor/level/thangs_tab_view.coffee

@@ -21,7 +21,7 @@ componentOriginals =
   "physics.Physical"          : "524b75ad7fc0f6d519000001"
 
 class ThangTypeSearchCollection extends CocoCollection
-  url: '/db/thang.type/search?project=true'
+  url: '/db/thang.type/search?project=original,name,version,slug,kind,components'
   model: ThangType
 
 module.exports = class ThangsTabView extends View
@@ -219,7 +219,7 @@ module.exports = class ThangsTabView extends View
 
   # TODO: figure out a good way to have all Surface clicks and Treema clicks just proxy in one direction, so we can maintain only one way of handling selection and deletion
   onExtantThangSelected: (e) ->
-    @selectedExtantSprite?.setNameLabel null unless @selectedExtantSprite is e.sprite
+    @selectedExtantSprite?.setNameLabel? null unless @selectedExtantSprite is e.sprite
     @selectedExtantThang = e.thang
     @selectedExtantSprite = e.sprite
     if e.thang and (key.alt or key.meta)
@@ -236,7 +236,7 @@ module.exports = class ThangsTabView extends View
         @selectedExtantSprite.setNameLabel @selectedExtantSprite.thangType.get('name') + ': ' + @selectedExtantThang.id
         if not treemaThang.isSelected()
           treemaThang.select()
-          @thangsTreema.$el.scrollTop(@thangsTreema.$el.find('.treema-children .treema-selected')[0].offsetTop) 
+          @thangsTreema.$el.scrollTop(@thangsTreema.$el.find('.treema-children .treema-selected')[0].offsetTop)
     else if @addThangSprite
       # We clicked on the background when we had an add Thang selected, so add it
       @addThang @addThangType, @addThangSprite.thang.pos

app/views/editor/thang/edit.coffee

@@ -1,15 +1,16 @@
-View = require 'views/kinds/RootView'
-template = require 'templates/editor/thang/edit'
 ThangType = require 'models/ThangType'
 SpriteParser = require 'lib/sprites/SpriteParser'
 SpriteBuilder = require 'lib/sprites/SpriteBuilder'
 CocoSprite = require 'lib/surface/CocoSprite'
 Camera = require 'lib/surface/Camera'
-ThangComponentEditView = require 'views/editor/components/main'
-VersionHistoryView = require './versions_view'
 DocumentFiles = require 'collections/DocumentFiles'
 
+View = require 'views/kinds/RootView'
+ThangComponentEditView = require 'views/editor/components/main'
+VersionHistoryView = require './versions_view'
 ColorsTabView = require './colors_tab_view'
+ErrorView = require '../../error_view'
+template = require 'templates/editor/thang/edit'
 
 CENTER = {x:200, y:300}
 
@@ -43,10 +44,22 @@ module.exports = class ThangTypeEditView extends View
     @mockThang = $.extend(true, {}, @mockThang)
     @thangType = new ThangType(_id: @thangTypeID)
     @thangType.saveBackups = true
+
+    @listenToOnce(@thangType, 'error', 
+      () => 
+        @hideLoading()
+
+        # Hack: editor components appear after calling insertSubView.
+        # So we need to hide them first. 
+        $(@$el).find('.main-content-area').children('*').not('#error-view').remove()
+
+        @insertSubView(new ErrorView())
+    )
+
     @thangType.fetch()
     @thangType.loadSchema()
-    @thangType.schema().once 'sync', @onThangTypeSync, @
-    @thangType.once 'sync', @onThangTypeSync, @
+    @listenToOnce(@thangType.schema(), 'sync', @onThangTypeSync)
+    @listenToOnce(@thangType, 'sync', @onThangTypeSync)
     @refreshAnimation = _.debounce @refreshAnimation, 500
 
   onThangTypeSync: ->

app/views/error_view.coffee

@@ -0,0 +1,6 @@
+View = require 'views/kinds/RootView'
+template = require 'templates/error'
+
+module.exports = class ErrorView extends View
+  id: "error-view"
+  template: template

app/views/kinds/RootView.coffee

@@ -62,7 +62,8 @@ module.exports = class RootView extends CocoView
     for code, localeInfo of locale when not (code in genericCodes) or code is preferred
       $select.append(
         $("<option></option>").val(code).text(localeInfo.nativeDescription))
-    $select.val(preferred).fancySelect()
+    $select.val(preferred).fancySelect().parent().find('.trigger').addClass('header-font')
+    $('body').attr('lang', preferred)
 
   onLanguageChanged: ->
     newLang = $(".language-dropdown").val()
@@ -72,6 +73,7 @@ module.exports = class RootView extends CocoView
     @buildLanguages()
     unless newLang.split('-')[0] is "en"
       @openModalView(application.router.getView("modal/diplomat_suggestion", "_modal"))
+    $('body').attr('lang', newLang)
 
   saveLanguage: (newLang) ->
     me.set('preferredLanguage', newLang)

app/views/kinds/SearchView.coffee

@@ -5,7 +5,7 @@ app = require('application')
 
 class SearchCollection extends Backbone.Collection
   initialize: (modelURL, @model, @term) ->
-    @url = "#{modelURL}/search?project=yes"
+    @url = "#{modelURL}/search?project=true"
     @url += "&term=#{term}" if @term
 
 module.exports = class ThangTypeHomeView extends View
@@ -110,7 +110,7 @@ module.exports = class ThangTypeHomeView extends View
     that = @
     res.success ->
       that.model = model
-      modal.modal('hide')      
+      modal.modal('hide')
 
   onModalHidden: ->
     # Can only redirect after the modal hidden event has triggered

app/views/play/level/control_bar_view.coffee

@@ -24,7 +24,7 @@ module.exports = class ControlBarView extends View
     'click #restart-button': ->
       window.tracker?.trackEvent 'Clicked Restart', level: @worldName, label: @worldName
       @showRestartModal()
-      
+
     'click #next-game-button': ->
       Backbone.Mediator.publish 'next-game-pressed'
 
@@ -64,9 +64,23 @@ module.exports = class ControlBarView extends View
       c.homeLink = "/play/ladder/" + levelID
     c
 
+  afterRender: ->
+    super()
+    @guideHighlightInterval ?= setInterval @onGuideHighlight, 5 * 60 * 1000
+
+  destroy: ->
+    clearInterval @guideHighlightInterval if @guideHighlightInterval
+    super()
+
+  onGuideHighlight: =>
+    return if @destroyed or @guideShownOnce
+    @$el.find('#docs-button').hide().show('highlight', 4000)
+
   showGuideModal: ->
     options = {docs: @level.get('documentation'), supermodel: @supermodel}
     @openModalView(new DocsModal(options))
+    clearInterval @guideHighlightInterval
+    @guideHighlightInterval = null
 
   showMultiplayerModal: ->
     @openModalView(new MultiplayerModal(session: @session, playableTeams: @playableTeams, level: @level, ladderGame: @ladderGame))

app/views/play/level/hud_view.coffee

@@ -150,7 +150,7 @@ module.exports = class HUDView extends View
 
   createActions: ->
     actions = @$el.find('.thang-actions tbody').empty()
-    showActions = @thang.world and not _.isEmpty(@thang.actions) and 'action' in @thang.hudProperties ? []
+    showActions = @thang.world and not @thang.notOfThisWorld and not _.isEmpty(@thang.actions) and 'action' in (@thang.hudProperties ? [])
     @$el.find('.thang-actions').toggleClass 'secret', not showActions
     return unless showActions
     @buildActionTimespans()

app/views/play/level/playback_view.coffee

@@ -35,46 +35,135 @@ module.exports = class PlaybackView extends View
     'click #volume-button': 'onToggleVolume'
     'click #play-button': 'onTogglePlay'
     'click': -> Backbone.Mediator.publish 'focus-editor'
+    'mouseenter #timeProgress': 'onProgressEnter'
+    'mouseleave #timeProgress': 'onProgressLeave'
+    'mousemove #timeProgress': 'onProgressHover'
 
   shortcuts:
     '⌘+p, p, ctrl+p': 'onTogglePlay'
     '⌘+[, ctrl+[': 'onScrubBack'
     '⌘+], ctrl+]': 'onScrubForward'
 
+
+  # popover that shows at the current mouse position on the progressbar, using the bootstrap popover.
+  # Could make this into a jQuery plugins itself theoretically.
+  class HoverPopup extends $.fn.popover.Constructor
+    constructor: () ->
+      @enabled = true
+      @shown = false
+      @type = "HoverPopup"
+      @options =
+        placement: 'top'
+        container: 'body'
+        animation: true
+        html: true
+        delay:
+          show: 400
+      @$element = $('#timeProgress')
+      @$tip = $('#timePopover')
+
+      @content = ""
+
+    getContent: -> @content
+
+    show: ->
+      unless @shown
+        super()
+        @shown = true
+
+    updateContent: (@content) ->
+      @setContent()
+      @$tip.addClass('fade top in')
+
+    onHover: (@e) ->
+      pos = @getPosition()
+      actualWidth  = @$tip[0].offsetWidth
+      actualHeight = @$tip[0].offsetHeight
+      calculatedOffset =
+        top: pos.top - actualHeight
+        left: pos.left + pos.width / 2 - actualWidth / 2
+      this.applyPlacement(calculatedOffset, 'top')
+
+    getPosition: ->
+      top: @$element.offset().top
+      left: if @e? then @e.pageX else @$element.offset().left
+      height: 0
+      width: 0
+
+    hide: ->
+      super()
+      @shown = false
+
+    disable: ->
+      super()
+      @hide()
+
   constructor: ->
     super(arguments...)
-    @listenTo(me, 'change:music', @updateMusicButton)
+    me.on('change:music', @updateMusicButton, @)
 
   afterRender: ->
     super()
+    @$progressScrubber = $('.scrubber .progress', @$el)
     @hookUpScrubber()
     @updateMusicButton()
     $(window).on('resize', @onWindowResize)
 
+  updatePopupContent: ->
+    @timePopup.updateContent "<h2>#{@timeToString @newTime}</h2>#{@formatTime(@current, @currentTime)}<br/>#{@formatTime(@total, @totalTime)}"
+
+  # These functions could go to some helper class
+
+  pad2: (num) ->
+    if not num? or num is 0 then "00" else ((if num < 10 then "0" else "") + num)
+
+  formatTime: (text, time) =>
+    "#{text}\t#{@timeToString time}"
+
+  timeToString: (time=0, withUnits=false) ->
+    mins = Math.floor(time / 60)
+    secs = (time - mins * 60).toFixed(1)
+    if withUnits
+      ret = ""
+      ret = (mins + " " + (if mins is 1 then @minute else @minutes)) if (mins > 0)
+      ret = (ret + " " + secs + " " + (if secs is 1 then @second else @seconds)) if (secs > 0 or mins is 0)
+    else
+      "#{mins}:#{@pad2 secs}"
+
   # callbacks
 
   updateMusicButton: ->
     @$el.find('#music-button').toggleClass('music-on', me.get('music'))
 
   onSetLetterbox: (e) ->
-    if e.on
-      $('.scrubber .progress', @$el).slider('disable', true).addClass('disabled')
-      $('#play-button', @$el).addClass('disabled')
-      $('.scrubber-handle', @$el).css('visibility', 'hidden')
-    else
-      $('.scrubber .progress', @$el).slider('enable', true).removeClass('disabled')
-      $('#play-button', @$el).removeClass('disabled')
-      $('.scrubber-handle', @$el).css('visibility', 'visible')
+    buttons = @$el.find '#play-button, .scrubber-handle'
+    buttons.css 'visibility', if e.on then 'hidden' else 'visible'
     @disabled = e.on
 
   onWindowResize: (s...) =>
     @barWidth = $('.progress', @$el).width()
 
   onNewWorld: (e) ->
+    @totalTime = e.world.totalFrames / e.world.frameRate
     pct = parseInt(100 * e.world.totalFrames / e.world.maxTotalFrames) + '%'
     @barWidth = $('.progress', @$el).css('width', pct).show().width()
     @casting = false
     $('.scrubber .progress', @$el).slider('enable', true)
+    @newTime = 0
+    @currentTime = 0
+
+    @timePopup = new HoverPopup unless @timePopup?
+
+
+    #TODO: Why do we need defaultValues here at all? Fallback language has been set to 'en'... oO
+    t = $.i18n.t
+    @second = t 'units.second', defaultValue: 'second'
+    @seconds = t 'units.seconds', defaultValue: 'seconds'
+    @minute = t 'units.minute', defaultValue: 'minute'
+    @minutes = t 'units.minutes', defaultValue: 'minutes'
+    @goto = t 'play_level.time_goto', defaultValue: "Go to:"
+    @current = t 'play_level.time_current', defaultValue: "Now:"
+    @total = t 'play_level.time_total', defaultValue: "Max:"
 
   onToggleDebug: ->
     return if @shouldIgnore()
@@ -94,16 +183,17 @@ module.exports = class PlaybackView extends View
 
   onCastSpells: ->
     @casting = true
-    $('.scrubber .progress', @$el).slider('disable', true)
+    @$progressScrubber.slider('disable', true)
 
   onDisableControls: (e) ->
     if not e.controls or 'playback' in e.controls
       @disabled = true
       $('button', @$el).addClass('disabled')
       try
-        $('.scrubber .progress', @$el).slider('disable', true)
+        @$progressScrubber.slider('disable', true)
       catch e
         #console.warn('error disabling scrubber')
+      @timePopup.disable()
     $('#volume-button', @$el).removeClass('disabled')
 
   onEnableControls: (e) ->
@@ -111,9 +201,10 @@ module.exports = class PlaybackView extends View
       @disabled = false
       $('button', @$el).removeClass('disabled')
       try
-        $('.scrubber .progress', @$el).slider('enable', true)
+        @$progressScrubber.slider('enable', true)
       catch e
         #console.warn('error enabling scrubber')
+      @timePopup.enable()
 
   onSetPlaying: (e) ->
     @playing = (e ? {}).playing ? true
@@ -142,10 +233,32 @@ module.exports = class PlaybackView extends View
 
   onFrameChanged: (e) ->
     if e.progress isnt @lastProgress
+      @currentTime = e.frame / e.world.frameRate
+      # Game will sometimes stop at 29.97, but with only one digit, this is unnecesary.
+      # @currentTime = @totalTime if Math.abs(@totalTime - @currentTime) < 0.04
+      @updatePopupContent()
+
       @updateProgress(e.progress)
       @updatePlayButton(e.progress)
     @lastProgress = e.progress
 
+  onProgressEnter: (e) ->
+    #Why it needs itself as parameter you ask? Ask Twitter instead..
+    @timePopup.enter @timePopup
+
+  onProgressLeave: (e) ->
+    @timePopup.leave @timePopup
+
+  onProgressHover: (e) ->
+    timeRatio = @$progressScrubber.width() / @totalTime
+    @newTime = e.offsetX / timeRatio
+    @updatePopupContent()
+    @timePopup.onHover e
+
+    #Show it instantaniously if close enough to current time.
+    if Math.abs(@currentTime - @newTime) < 1 and not @timePopup.shown
+      @timePopup.show() unless @timePopup.shown
+
   updateProgress: (progress) ->
     $('.scrubber .progress-bar', @$el).css('width', "#{progress*100}%")
 
@@ -169,7 +282,7 @@ module.exports = class PlaybackView extends View
   hookUpScrubber: ->
     @sliderIncrements = 500  # max slider width before we skip pixels
     @clickingSlider = false  # whether the mouse has been pressed down without moving
-    $('.scrubber .progress', @$el).slider(
+    @$progressScrubber.slider(
       max: @sliderIncrements
       animate: "slow"
       slide: (event, ui) =>
@@ -192,8 +305,7 @@ module.exports = class PlaybackView extends View
     )
 
   getScrubRatio: ->
-    bar = $('.scrubber .progress', @$el)
-    $('.progress-bar', bar).width() / bar.width()
+    @$progressScrubber.find('.progress-bar').width() / @$progressScrubber.width()
 
   scrubTo: (ratio, duration=0) ->
     return if @shouldIgnore()
@@ -227,3 +339,9 @@ module.exports = class PlaybackView extends View
     me.set('music', not me.get('music'))
     me.save()
     $(document.activeElement).blur()
+
+  destroy: ->
+    me.off('change:music', @updateMusicButton, @)
+    $(window).off('resize', @onWindowResize)
+    @onWindowResize = null
+    super()

app/views/play/level/tome/problem_alert_view.coffee

@@ -24,7 +24,8 @@ module.exports = class ProblemAlertView extends View
 
   afterRender: ->
     super()
-    @$el.addClass('alert').addClass("alert-#{@problem.aetherProblem.level}")
+    @$el.addClass('alert').addClass("alert-#{@problem.aetherProblem.level}").hide().fadeIn('slow')
+    Backbone.Mediator.publish 'play-sound', trigger: 'error_appear', volume: 1.0
 
   onRemoveClicked: ->
     @$el.remove()

app/views/play/level/tome/spell_list_tab_entry_view.coffee

@@ -60,6 +60,7 @@ module.exports = class SpellListTabEntryView extends SpellListEntryView
           found = true
           break
     return unless found
+    doc = _.clone doc
     doc.owner = 'this'
     doc.shortName = doc.shorterName = doc.title = "this.#{doc.name}();"
     @$el.find('code').popover(

app/views/play/level/tome/tome_view.coffee

@@ -131,7 +131,6 @@ module.exports = class TomeView extends View
         unless method.cloneOf
           skipProtectAPI = @getQueryVariable "skip_protect_api", not @options.ladderGame
           skipFlow = @getQueryVariable "skip_flow", @options.levelID is 'brawlwood'
-          console.log 'skip protect api', skipProtectAPI, 'skip flow', skipFlow
           spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipFlow: skipFlow, skipProtectAPI: skipProtectAPI, worker: @worker
     for thangID, spellKeys of @thangSpells
       thang = world.getThangByID thangID

app/views/play_view.coffee

@@ -154,6 +154,20 @@ module.exports = class PlayView extends View
         image: '/file/db/level/526fd3043c637ece50001bb2/the_herd_icon.png'
         description: "Strike at the weak point in an array of enemies. - by Aftermath"
       }
+      {
+        name: 'Sword Loop'
+        difficulty: 2
+        id: 'sword-loop'
+        image: '/file/db/level/525dc5589a0765e496000006/drink_me_icon.png'
+        description: 'Kill the ogres and save the peasants with for-loops. - by Prabh Simran Singh Baweja'
+      }
+      {
+        name: 'Coin Mania'
+        difficulty: 2
+        id: 'coin-mania'
+        image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png'
+        description: 'Learn while-loops to grab coins and potions. - by Prabh Simran Singh Baweja'
+      }
       {
         name: 'Bubble Sort Bootcamp Battle'
         difficulty: 3
@@ -161,13 +175,6 @@ module.exports = class PlayView extends View
         image: '/file/db/level/525ef8ef06e1ab0962000003/commanding_followers_icon.png'
         description: "Write a bubble sort to organize your soldiers. - by Alexandru"
       }
-      {
-        name: 'Sword Loop'
-        difficulty: 1
-        id: 'sword-loop'
-        image: '/file/db/level/525dc5589a0765e496000006/drink_me_icon.png'
-        description: 'Kill the ogres and save the peasants and their cattle. - by Prabh Simran Singh Baweja'
-      }
       {
         name: 'Ogres of Hanoi'
         difficulty: 3

bin/coco-mongodb

@@ -71,7 +71,7 @@ def which(cmd, mode=os.F_OK | os.X_OK, path=None):
 
 
 current_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
-allowedMongoVersions = ["v2.5.4","v2.5.5","v2.6.0-rc1"]
+allowedMongoVersions = ["v2.5.4","v2.5.5","v2.6.0"]
 if which("mongod") and any(i in subprocess.check_output("mongod --version",shell=True) for i in allowedMongoVersions):
     mongo_executable = "mongod"
 else:

scripts/devSetup/bootstrap.sh

@@ -11,12 +11,23 @@ function checkDependencies { #usage: checkDependencies [name of dependency array
     done
 }
 
+function openUrl {
+    case "$OSTYPE" in
+        darwin*)
+            open $@;;
+        linux*)
+            xdg-open $@;;
+        *)
+            echo "$@";;
+    esac
+}
+
 function basicDependenciesErrorHandling {
     case "$1" in
     "python")
         echo "Python isn't installed. Please install it to continue."
         read -p "Press enter to open download link..."
-        open http://www.python.org/getit/
+        openUrl http://www.python.org/download/
         exit 1
         ;;
     "git")

scripts/devSetup/factories.py

@@ -39,8 +39,8 @@ class SetupFactory(object):
             mongo_version_string = mongo_version_string.decode(encoding='UTF-8')
         except:
             print("Mongod not found.")
-        if "v2.5.4" not in mongo_version_string:
-            print("MongoDB 2.5.4 not found, so installing...")
+        if "v2.6." not in mongo_version_string:
+            print("MongoDB not found, so installing...")
             self.mongo.download_dependencies()
             self.mongo.install_dependencies()
         self.node.download_dependencies()
@@ -61,12 +61,17 @@ class SetupFactory(object):
         chown_directory = self.config.directory.root_dir + os.sep + "coco"
         subprocess.call(chown_command,shell=True,cwd=chown_directory)
 
-        print("Done! If you want to start the server, head into /coco/bin and run ")
+        print("")
+        print("Done! If you want to start the server, head into coco/bin and run ")
         print("1. ./coco-mongodb")
         print("2. ./coco-brunch ")
         print("3. ./coco-dev-server")
         print("NOTE: brunch may need to be run as sudo if it doesn't work (ulimit needs to be set higher than default)")
-        print("Once brunch is done, visit http://localhost:3000!")
+        print("")
+        print("Before can play any levels you must update the database. See the Setup section here:")
+        print("https://github.com/codecombat/codecombat/wiki/Developer-environment#setup")
+        print("")
+        print("Go to http://localhost:3000 to see your local CodeCombat in action!")
     def cleanup(self):
         self.config.directory.remove_tmp_directory()
 

scripts/devSetup/mongo.py

@@ -79,10 +79,10 @@ class LinuxMongoDBDownloader(MongoDBDownloader):
     @property
     def download_url(self):
         if self.dependency.config.mem_width == 64:
-            return u"http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-2.5.4.tgz"
+            return u"http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-latest.tgz"
         else:
             warnings.warn(u"MongoDB *really* doesn't run well on 32 bit systems. You have been warned.")
-            return u"http://fastdl.mongodb.org/linux/mongodb-linux-i686-2.5.4.tgz"
+            return u"http://fastdl.mongodb.org/linux/mongodb-linux-i686-latest.tgz"
 
 class WindowsMongoDBDownloader(MongoDBDownloader):
     @property
@@ -90,13 +90,13 @@ class WindowsMongoDBDownloader(MongoDBDownloader):
         #TODO: Implement Windows Vista detection
         warnings.warn(u"If you have a version of Windows older than 7, MongoDB may not function properly!")
         if self.dependency.config.mem_width == 64:
-            return u"http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.5.4.zip"
+            return u"http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-latest.zip"
         else:
-            return u"http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip"
+            return u"http://fastdl.mongodb.org/win32/mongodb-win32-i386-latest.zip"
 
 class MacMongoDBDownloader(MongoDBDownloader):
     @property
     def download_url(self):
-        return u"http://fastdl.mongodb.org/osx/mongodb-osx-x86_64-2.5.4.tgz"
+        return u"http://fastdl.mongodb.org/osx/mongodb-osx-x86_64-latest.tgz"
 
 

scripts/devSetup/repositoryInstaller.py

@@ -12,14 +12,14 @@ class RepositoryInstaller():
         assert isinstance(self.config,configuration.Configuration)
         if not self.checkIfGitExecutableExists():
             if self.config.system.operating_system == "linux":
-                raise errors.CoCoError("Git is missing. Please install it(with apt, type 'sudo apt-get install git'")
+                raise errors.CoCoError("Git is missing. Please install it (try 'sudo apt-get install git')\nIf you are not using Ubuntu then please see your Linux Distribution's documentation for help installing git.")
             elif self.config.system.operating_system == "mac":
                 raise errors.CoCoError("Git is missing. Please install the Xcode command line tools.")
             raise errors.CoCoError(u"Git is missing. Please install git.")
             #http://stackoverflow.com/questions/9329243/xcode-4-4-and-later-install-command-line-tools
         if not self.checkIfCurlExecutableExists():
             if self.config.system.operating_system == "linux":
-                raise errors.CoCoError("Curl is missing. Please install it(with apt, type 'sudo apt-get install curl'")
+                raise errors.CoCoError("Curl is missing. Please install it(try 'sudo apt-get install curl')\nIf you are not using Ubuntu then please see your Linux Distribution's documentation for help installing curl.")
             elif self.config.system.operating_system == "mac":
                 raise errors.CoCoError("Curl is missing. Please install the Xcode command line tools.")
             raise errors.CoCoError(u"Git is missing. Please install git.")

scripts/devSetup/ruby.py

@@ -34,9 +34,9 @@ class Ruby(dependency.Dependency):
         elif operating_system == u"mac":
             raise errors.CoCoError(u"Ruby should be installed with Mac OSX machines. Please install Ruby.")
         elif operating_system == u"linux":
-            raise errors.CoCoError(u"Please install Ruby on your Linux distribution(try 'sudo apt-get install ruby'.")
+            raise errors.CoCoError(u"Please install Ruby (try 'sudo apt-get install ruby').\nIf you are not using Ubuntu then please see your Linux Distribution's documentation for help installing ruby."")
     def install_ruby_on_windows(self):
         raise NotImplementedError
 
     def install_gems(self):
-        gem_install_status = subprocess.call([u"gem",u"install",u"sass"])
+        gem_install_status = subprocess.call([u"gem",u"install",u"--no-user-install",u"sass"])

server/commons/Handler.coffee

@@ -2,6 +2,8 @@ async = require 'async'
 mongoose = require('mongoose')
 Grid = require 'gridfs-stream'
 errors = require './errors'
+log = require 'winston'
+
 PROJECT = {original:1, name:1, version:1, description: 1, slug:1, kind: 1}
 FETCH_LIMIT = 150
 
@@ -99,6 +101,17 @@ module.exports = class Handler
     filters = [{filter: {index: true}}]
     if @modelClass.schema.uses_coco_permissions and req.user
       filters.push {filter: {index: req.user.get('id')}}
+    projection = null
+    if req.query.project is 'true'
+      projection = PROJECT
+    else if req.query.project
+      if @modelClass.className is 'User'
+        projection = PROJECTION
+        log.warn "Whoa, we haven't yet thought about public properties for User projection yet."
+      else
+        projection = {}
+        for field in req.query.project.split(',')
+          projection[field] = 1
     for filter in filters
       callback = (err, results) =>
         return @sendDatabaseError(res, err) if err
@@ -111,11 +124,11 @@ module.exports = class Handler
           res.send matchedObjects
           res.end()
       if term
-        filter.project = PROJECT if req.query.project
+        filter.project = projection
         @modelClass.textSearch term, filter, callback
       else
         args = [filter.filter]
-        args.push PROJECT if req.query.project
+        args.push projection if projection
         @modelClass.find(args...).limit(FETCH_LIMIT).exec callback
 
   versions: (req, res, id) ->
@@ -123,8 +136,9 @@ module.exports = class Handler
     # Keeping it simple for now and just allowing access to the first FETCH_LIMIT results.
     query = {'original': mongoose.Types.ObjectId(id)}
     sort = {'created': -1}
-    selectString = 'slug name version commitMessage created permissions'  # Is this even working?
-    @modelClass.find(query).select(selectString).limit(FETCH_LIMIT).sort(sort).exec (err, results) =>
+    selectString = 'slug name version commitMessage created permissions'
+    aggregate = $match: query
+    @modelClass.aggregate(aggregate).project(selectString).limit(FETCH_LIMIT).sort(sort).exec (err, results) =>
       return @sendDatabaseError(res, err) if err
       for doc in results
         return @sendUnauthorizedError(res) unless @hasAccessToDocument(req, doc)