Merge pull request #8 from codecombat/master

update from codecombat

app/assets/javascripts/workers/worker_world.js

@@ -96,7 +96,9 @@ Aether.addGlobal('_', _);
 var serializedClasses = {
     "Thang": self.require('lib/world/thang'),
     "Vector": self.require('lib/world/vector'),
-    "Rectangle": self.require('lib/world/rectangle')
+    "Rectangle": self.require('lib/world/rectangle'),
+    "Ellipse": self.require('lib/world/ellipse'),
+    "LineSegment": self.require('lib/world/line_segment')
 };
 self.currentUserCodeMapCopy = "";
 self.currentDebugWorldFrame = 0;
@@ -298,6 +300,9 @@ self.setupDebugWorldToRunUntilFrame = function (args) {
         }
         Math.random = self.debugWorld.rand.randf;  // so user code is predictable
         Aether.replaceBuiltin("Math", Math);
+        replacedLoDash = _.runInContext(self);
+        for(var key in replacedLoDash)
+          _[key] = replacedLoDash[key];
     }
     self.debugWorld.totalFrames = args.frame; //hack to work around error checking
     self.currentDebugWorldFrame = args.frame;
@@ -353,6 +358,9 @@ self.runWorld = function runWorld(args) {
   }
   Math.random = self.world.rand.randf;  // so user code is predictable
   Aether.replaceBuiltin("Math", Math);
+  replacedLoDash = _.runInContext(self);
+  for(var key in replacedLoDash)
+    _[key] = replacedLoDash[key];
   self.postMessage({type: 'start-load-frames'});
   self.world.loadFrames(self.onWorldLoaded, self.onWorldError, self.onWorldLoadProgress);
 };

app/lib/Router.coffee

@@ -17,8 +17,12 @@ module.exports = class CocoRouter extends Backbone.Router
     'editor/:model(/:slug_or_id)(/:subview)': 'editorModelView'
 
     # Direct links
+    'test': go('TestView')
     'test/*subpath': go('TestView')
+
+    'demo': go('DemoView')
     'demo/*subpath': go('DemoView')
+
     'play/ladder/:levelID': go('play/ladder/ladder_view')
     'play/ladder': go('play/ladder_home')
 

app/lib/deltas.coffee

@@ -170,8 +170,8 @@ module.exports.pruneExpandedDeltasFromDelta = (delta, expandedDeltas) ->
 
 prunePath = (delta, path) ->
   if path.length is 1
-    delete delta[path]
+    delete delta[path] unless delta[path] is undefined
   else
-    prunePath delta[path[0]], path.slice(1)
+    prunePath delta[path[0]], path.slice(1) unless delta[path[0]] is undefined
     keys = (k for k in _.keys(delta[path[0]]) when k isnt '_t')
     delete delta[path[0]] if keys.length is 0

app/lib/forms.coffee

@@ -9,12 +9,12 @@ module.exports.formToObject = (el) ->
 
   obj
 
-module.exports.applyErrorsToForm = (el, errors) ->
+module.exports.applyErrorsToForm = (el, errors, warning=false) ->
   errors = [errors] if not $.isArray(errors)
-  missingErrors = []
   for error in errors
     if error.dataPath
       prop = error.dataPath[1..]
+      console.log prop
       message = error.message
 
     else
@@ -23,16 +23,28 @@ module.exports.applyErrorsToForm = (el, errors) ->
       message = error.message if error.formatted
       prop = error.property
 
-    input = $("[name='#{prop}']", el)
-    if not input.length
-      missingErrors.push(error)
-      continue
-    formGroup = input.closest('.form-group')
-    formGroup.addClass 'has-error'
-    formGroup.append($("<span class='help-block error-help-block'>#{message}</span>"))
-  return missingErrors
+    setErrorToProperty el, prop, message, warning
+
+module.exports.setErrorToField = setErrorToField = (el, message, warning=false) ->
+  formGroup = el.closest('.form-group')
+  unless formGroup.length
+    return console.error "#{el} did not contain a form group"
+
+  kind = if warning then 'warning' else 'error'
+  formGroup.addClass "has-#{kind}"
+  formGroup.append $("<span class='help-block #{kind}-help-block'>#{message}</span>")
+
+module.exports.setErrorToProperty = setErrorToProperty = (el, property, message, warning=false) ->
+  input = $("[name='#{property}']", el)
+  unless input.length
+    return console.error "#{property} not found in #{el}"
+
+  setErrorToField input, message, warning
 
 module.exports.clearFormAlerts = (el) ->
   $('.has-error', el).removeClass('has-error')
+  $('.has-warning', el).removeClass('has-warning')
   $('.alert.alert-danger', el).remove()
+  $('.alert.alert-warning', el).remove()
   el.find('.help-block.error-help-block').remove()
+  el.find('.help-block.warning-help-block').remove()

app/lib/scripts/ScriptManager.coffee

@@ -320,6 +320,7 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
       if ((noteGroup.script?.skippable) is false) and not options.force
         @noteGroupQueue = @noteGroupQueue[i..]
         @run()
+        @notifyScriptStateChanged()
         return
 
       @processNoteGroup(noteGroup)
@@ -331,6 +332,7 @@ module.exports = ScriptManager = class ScriptManager extends CocoClass
     @noteGroupQueue = []
 
     @resetThings()
+    @notifyScriptStateChanged()
 
   onNoteGroupTimeout: (noteGroup) ->
     return unless noteGroup is @currentNoteGroup

app/lib/surface/CocoSprite.coffee

@@ -242,7 +242,17 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       args = JSON.parse(event[4...])
       pos = @options.camera.worldToSurface {x: args[0], y: args[1]}
       circle = new createjs.Shape()
-      circle.graphics.beginFill(args[3]).drawCircle(0, 0, args[2]*Camera.PPM)
+      radius = args[2] * Camera.PPM
+      if args.length is 4
+        circle.graphics.beginFill(args[3]).drawCircle(0, 0, radius)
+      else
+        startAngle = args[4]
+        endAngle = args[5]
+        circle.graphics.beginFill(args[3])
+          .lineTo(0, 0)
+          .lineTo(radius * Math.cos(startAngle), radius * Math.sin(startAngle))
+          .arc(0, 0, radius, startAngle, endAngle)
+          .lineTo(0, 0)
       circle.x = pos.x
       circle.y = pos.y
       circle.scaleY = @options.camera.y2x * 0.7
@@ -318,7 +328,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @baseScaleX *= -1 if @getActionProp 'flipX'
     @baseScaleY *= -1 if @getActionProp 'flipY'
     # temp, until these are re-exported with perspective
-    floors = ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Goal Trigger', 'Obstacle']
+    floors = ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Grass01', 'Grass02', 'Grass03', 'Grass04', 'Grass05', 'Goal Trigger', 'Obstacle']
     if @options.camera and @thangType.get('name') in floors
       @baseScaleY *= @options.camera.y2x
 

app/lib/surface/CoordinateDisplay.coffee

@@ -25,9 +25,11 @@ module.exports = class CoordinateDisplay extends createjs.Container
     @mouseEnabled = @mouseChildren = false
     @addChild @background = new createjs.Shape()
     @addChild @label = new createjs.Text('', 'bold 16px Arial', '#FFFFFF')
+    @addChild @pointMarker = new createjs.Shape()
     @label.name = 'Coordinate Display Text'
     @label.shadow = new createjs.Shadow('#000000', 1, 1, 0)
     @background.name = 'Coordinate Display Background'
+    @pointMarker.name = 'Point Marker'
 
   onMouseOver: (e) -> @mouseInBounds = true
   onMouseOut: (e) -> @mouseInBounds = false
@@ -60,26 +62,58 @@ module.exports = class CoordinateDisplay extends createjs.Container
     return unless @label.parent
     @removeChild @label
     @removeChild @background
+    @removeChild @pointMarker
     @uncache()
 
   updateSize: ->
     margin = 3
-    radius = 2.5
-    width = @label.getMeasuredWidth() + 2 * margin
-    height = @label.getMeasuredHeight() + 2 * margin
-    @label.regX = @background.regX = width / 2
-    @label.regY = @background.regY = height / 2
-    @label.regX -= margin
-    @label.regY -= margin
+    contentWidth = @label.getMeasuredWidth() + (2 * margin)
+    contentHeight = @label.getMeasuredHeight() + (2 * margin)
+
+    # Shift all contents up so marker is at pointer (affects container cache position)
+    @label.regY = @background.regY = @pointMarker.regY = contentHeight
+
+    pointMarkerStroke = 2
+    pointMarkerLength = 3
+    contributionsToTotalSize = []
+    contributionsToTotalSize = contributionsToTotalSize.concat @updateCoordinates contentWidth, contentHeight, pointMarkerStroke
+    contributionsToTotalSize = contributionsToTotalSize.concat @updatePointMarker contentHeight, pointMarkerLength, pointMarkerStroke
+
+    totalWidth = contentWidth + contributionsToTotalSize.reduce (a, b) -> a + b
+    totalHeight = contentHeight + contributionsToTotalSize.reduce (a, b) -> a + b
+    [totalWidth, totalHeight]
+
+  updateCoordinates: (contentWidth, contentHeight, initialXYOffset) ->
+    gap = 2
+    labelAndBgMarkerOffset = initialXYOffset * gap
+
+    # Center label horizontally and vertically
+    @label.x = contentWidth / 2 - (@label.getMeasuredWidth() / 2) + labelAndBgMarkerOffset
+    @label.y = contentHeight / 2 - (@label.getMeasuredHeight() / 2) - labelAndBgMarkerOffset
+
     @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)
+      .setStrokeStyle(backgroundStroke = 1)
+      .drawRoundRect(labelAndBgMarkerOffset, -labelAndBgMarkerOffset, contentWidth, contentHeight, radius = 2.5)
       .endFill()
       .endStroke()
-    [width, height]
+    contributionsToTotalSize = [labelAndBgMarkerOffset, backgroundStroke]
+
+  updatePointMarker: (contentHeight, length, strokeSize) ->
+    shiftToLineupWithGrid = strokeSize / 2
+    pointMarkerInitialX = strokeSize - shiftToLineupWithGrid
+    pointMarkerInitialY = contentHeight - strokeSize + shiftToLineupWithGrid
+    @pointMarker.graphics
+      .beginStroke('rgb(142, 198, 67')
+      .setStrokeStyle(strokeSize, 'square')
+      .moveTo(pointMarkerInitialX, pointMarkerInitialY)
+      .lineTo(pointMarkerInitialX, pointMarkerInitialY - length)
+      .moveTo(pointMarkerInitialX, pointMarkerInitialY)
+      .lineTo(pointMarkerInitialX + length, pointMarkerInitialY)
+      .endStroke()
+    contributionsToTotalSize = [strokeSize]
 
   show: =>
     return unless @mouseInBounds and @lastPos and not @destroyed
@@ -87,8 +121,9 @@ module.exports = class CoordinateDisplay extends createjs.Container
     [width, height] = @updateSize()
     sup = @camera.worldToSurface @lastPos
     @x = sup.x
-    @y = sup.y - 2.5
+    @y = sup.y
     @addChild @background
     @addChild @label
-    @cache -width / 2, -height / 2, width, height
+    @addChild @pointMarker
+    @cache 0, -height, width, height
     Backbone.Mediator.publish 'surface:coordinates-shown', {}

app/lib/surface/Mark.coffee

@@ -66,10 +66,10 @@ module.exports = class Mark extends CocoClass
     @mark = new createjs.Container()
     @mark.mouseChildren = false
     style = @sprite.thang.drawsBoundsStyle
+    @drawsBoundsIndex = @sprite.thang.drawsBoundsIndex
     return if style is 'corner-text' and @sprite.thang.world.age is 0
 
     # Confusingly make some semi-random colors that'll be consistent based on the drawsBoundsIndex
-    @drawsBoundsIndex = @sprite.thang.drawsBoundsIndex
     colors = (128 + Math.floor(('0.'+Math.sin(3 * @drawsBoundsIndex + i).toString().substr(6)) * 128) for i in [1 ... 4])
     color = "rgba(#{colors[0]}, #{colors[1]}, #{colors[2]}, 0.5)"
     [w, h] = [@sprite.thang.width * Camera.PPM, @sprite.thang.height * Camera.PPM * @camera.y2x]
@@ -181,12 +181,11 @@ module.exports = class Mark extends CocoClass
   buildDebug: ->
     @mark = new createjs.Shape()
     PX = 3
-    [w, h] = [Math.max(PX, @sprite.thang.width * Camera.PPM), Math.max(PX, @sprite.thang.height * Camera.PPM) * @camera.y2x]
+    [w, h] = [Math.max(PX, @sprite.thang.width * Camera.PPM), Math.max(PX, @sprite.thang.height * Camera.PPM) * @camera.y2x]  # TODO: doesn't work with rotation
     @mark.alpha = 0.5
     @mark.graphics.beginFill '#abcdef'
     if @sprite.thang.shape in ['ellipsoid', 'disc']
-      [w, h] = [Math.max(PX, w, h), Math.max(PX, w, h)]
-      @mark.graphics.drawCircle 0, 0, w / 2
+      @mark.graphics.drawEllipse -w / 2, -h / 2, w, h
     else
       @mark.graphics.drawRect -w / 2, -h / 2, w, h
     @mark.graphics.endFill()
@@ -259,7 +258,7 @@ module.exports = class Mark extends CocoClass
 
   updateRotation: ->
     if @name is 'debug' or (@name is 'shadow' and @sprite.thang?.shape in ['rectangle', 'box'])
-      @mark.rotation = @sprite.thang.rotation * 180 / Math.PI
+      @mark.rotation = -@sprite.thang.rotation * 180 / Math.PI
 
   updateScale: ->
     if @name is 'bounds' and ((@sprite.thang.width isnt @lastWidth or @sprite.thang.height isnt @lastHeight) or (@sprite.thang.drawsBoundsIndex isnt @drawsBoundsIndex))

app/lib/surface/SpriteBoss.coffee

@@ -106,7 +106,7 @@ module.exports = class SpriteBoss extends CocoClass
 
   createOpponentWizard: (opponent) ->
     # TODO: colorize name and cloud by team, colorize wizard by user's color config, level-specific wizard spawn points
-    sprite = @createWizardSprite thangID: opponent.id, name: opponent.name
+    sprite = @createWizardSprite thangID: opponent.id, name: opponent.name, codeLanguage: opponent.codeLanguage
     if not opponent.levelSlug or opponent.levelSlug is 'brawlwood'
       sprite.targetPos = if opponent.team is 'ogres' then {x: 52, y: 52} else {x: 28, y: 28}
     else if opponent.levelSlug is 'dungeon-arena'

app/lib/surface/Surface.coffee

@@ -608,7 +608,7 @@ module.exports = Surface = class Surface extends CocoClass
       ratio = current % 1
       @world.frames[next].restorePartialState ratio if next > 1
     frame.clearEvents() if parseInt(@currentFrame) is parseInt(@lastFrame)
-    @spriteBoss.updateSounds()
+    @spriteBoss.updateSounds() if parseInt(@currentFrame) isnt parseInt(@lastFrame)
 
   updateState: (frameChanged) ->
     # world state must have been restored in @restoreWorldState

app/lib/surface/WizardSprite.coffee

@@ -54,6 +54,11 @@ module.exports = class WizardSprite extends IndieSprite
     @updateRotation()
     # Don't call general update() because Thang isn't built yet
 
+  setNameLabel: (name) ->
+    if @options.codeLanguage and @options.codeLanguage isnt 'javascript' and not @isSelf
+      name += " (#{@options.codeLanguage})"  # TODO: move on second line, capitalize properly
+    super name
+
   onPlayerStatesChanged: (e) ->
     for playerID, state of e.states
       continue unless playerID is @thang.id

app/lib/world/ellipse.coffee

@@ -0,0 +1,174 @@
+Vector = require './vector'
+LineSegment = require './line_segment'
+Rectangle = require './rectangle'
+
+class Ellipse
+  @className: "Ellipse"
+
+  # TODO: add class methods for add, multiply, subtract, divide, rotate
+
+  isEllipse: true
+  apiProperties: ['x', 'y', 'width', 'height', 'rotation', 'distanceToPoint', 'distanceSquaredToPoint', 'distanceToRectangle', 'distanceSquaredToRectangle', 'distanceToEllipse', 'distanceSquaredToEllipse', 'distanceToShape', 'distanceSquaredToShape', 'containsPoint', 'intersectsLineSegment', 'intersectsRectangle', 'intersectsEllipse', 'getPos', 'containsPoint', 'copy']
+
+  constructor: (@x=0, @y=0, @width=0, @height=0, @rotation=0) ->
+
+  copy: ->
+    new Ellipse(@x, @y, @width, @height, @rotation)
+
+  getPos: ->
+    new Vector(@x, @y)
+
+  rectangle: ->
+    new Rectangle(@x, @y, @width, @height, @rotation)
+
+  axisAlignedBoundingBox: (rounded=true) ->
+    @rectangle().axisAlignedBoundingBox()
+
+  distanceToPoint: (p) ->
+    @rectangle().distanceToPoint p  # TODO: actually implement ellipse ellipse-point distance
+
+  distanceSquaredToPoint: (p) ->
+    # Doesn't handle rotation; just supposed to be faster than distanceToPoint.
+    @rectangle().distanceSquaredToPoint p  # TODO: actually implement ellipse-point distance
+
+  distanceToRectangle: (other) ->
+    Math.sqrt @distanceSquaredToRectangle other
+
+  distanceSquaredToRectangle: (other) ->
+    @rectangle().distanceSquaredToRectangle other  # TODO: actually implement ellipse-rectangle distance
+
+  distanceToEllipse: (ellipse) ->
+    Math.sqrt @distanceSquaredToEllipse ellipse
+
+  distanceSquaredToEllipse: (ellipse) ->
+    @rectangle().distanceSquaredToEllipse ellipse  # TODO: actually implement ellipse-ellipse distance
+
+  distanceToShape: (shape) ->
+    Math.sqrt @distanceSquaredToShape shape
+
+  distanceSquaredToShape: (shape) ->
+    if shape.isEllipse then @distanceSquaredToEllipse shape else @distanceSquaredToRectangle shape
+
+  containsPoint: (p, withRotation=true) ->
+    [a, b] = [@width / 2, @height / 2]
+    [h, k] = [@x, @y]
+    [x, y] = [p.x, p.y]
+    x2 = Math.pow(x, 2)
+    a2 = Math.pow(a, 2)
+    a4 = Math.pow(a, 4)
+    b2 = Math.pow(b, 2)
+    b4 = Math.pow(b, 4)
+    h2 = Math.pow(h, 2)
+    k2 = Math.pow(k, 2)
+    if withRotation and @rotation
+      sint = Math.sin(@rotation)
+      sin2t = Math.sin(2 * @rotation)
+      cost = Math.cos(@rotation)
+      cos2t = Math.cos(2 * @rotation)
+      numeratorLeft = (-a2 * h * sin2t) + (a2 * k * cos2t) + (a2 * k) + (a2 * x * sin2t)
+      numeratorMiddle = Math.SQRT2 * Math.sqrt((a4 * b2 * cos2t) + (a4 * b2) - (a2 * b4 * cos2t) + (a2 * b4) - (2 * a2 * b2 * h2) + (4 * a2 * b2 * h * x) - (2 * a2 * b2 * x2))
+      numeratorRight = (b2 * h * sin2t) - (b2 * k * cos2t) + (b2 * k) - (b2 * x * sin2t)
+      denominator = (a2 * cos2t) + a2 - (b2 * cos2t) + b2
+      solution1 = (numeratorLeft - numeratorMiddle + numeratorRight) / denominator
+      solution2 = (numeratorLeft + numeratorMiddle + numeratorRight) / denominator
+      if (not isNaN solution1) and (not isNaN solution2)
+        [bigSolution, littleSolution] = if solution1 > solution2 then [solution1, solution2] else [solution2, solution1]
+        if y > littleSolution and y < bigSolution
+          return true
+        else
+          return false
+      else
+        return false
+    else
+      numeratorLeft = a2 * k
+      numeratorRight = Math.sqrt((a4 * b2) - (a2 * b2 * h2) + (2 * a2 * b2 * h * x) - (a2 * b2 * x2))
+      denominator = a2
+      solution1 = (numeratorLeft + numeratorRight) / denominator
+      solution2 = (numeratorLeft - numeratorRight) / denominator
+      if (not isNaN solution1) and (not isNaN solution2)
+        [bigSolution, littleSolution] = if solution1 > solution2 then [solution1, solution2] else [solution2, solution1]
+        if y > littleSolution and y < bigSolution
+          return true
+        else
+          return false
+      else
+        return false
+    false
+
+  intersectsLineSegment: (p1, p2) ->
+    [px1, py1, px2, py2] = [p1.x, p1.y, p2.x, p2.y]
+    m = (py1 - py2) / (px1 - px2)
+    m2 = Math.pow(m, 2)
+    c = py1 - (m * px1)
+    c2 = Math.pow(c, 2)
+    [a, b] = [@width / 2, @height / 2]
+    [h, k] = [@x, @y]
+    a2 = Math.pow(a, 2)
+    a4 = Math.pow(a, 2)
+    b2 = Math.pow(b, 2)
+    b4 = Math.pow(b, 4)
+    h2 = Math.pow(h, 2)
+    k2 = Math.pow(k, 2)
+    sint = Math.sin(@rotation)
+    sin2t = Math.sin(2 * @rotation)
+    cost = Math.cos(@rotation)
+    cos2t = Math.cos(2 * @rotation)
+    if (not isNaN m) and m != Infinity and m != -Infinity
+      numeratorLeft = (-a2 * c * m * cos2t) - (a2 * c * m) + (a2 * c * sin2t) - (a2 * h * m * sin2t) - (a2 * h * cos2t) + (a2 * h) + (a2 * k * m * cos2t) + (a2 * k * m) - (a2 * k * sin2t)
+      numeratorMiddle = Math.SQRT2 * Math.sqrt((a4 * b2 * m2 * cos2t) + (a4 * b2 * m2) - (2 * a4 * b2 * m * sin2t) - (a4 * b2 * cos2t) + (a4 * b2) - (a2 * b4 * m2 * cos2t) + (a2 * b4 * m2) + (2 * a2 * b4 * m * sin2t) + (a2 * b4 * cos2t) + (a2 * b4) - (2 * a2 * b2 * c2) - (4 * a2 * b2 * c * h * m) + (4 * a2 * b2 * c * k) - (2 * a2 * b2 * h2 * m2) + (4 * a2 * b2 * h * k * m) - (2 * a2 * b2 * k2))
+      numeratorRight = (b2 * c * m * cos2t) - (b2 * c * m) - (b2 * c * sin2t) + (b2 * h * m * sin2t) + (b2 * h * cos2t) + (b2 * h) - (b2 * k * m * cos2t) + (b2 * k * m) + (b2 * k * sin2t)
+      denominator = (a2 * m2 * cos2t) + (a2 * m2) - (2 * a2 * m * sin2t) - (a2 * cos2t) + a2 - (b2 * m2 * cos2t) + (b2 * m2) + (2 * b2 * m * sin2t) + (b2 * cos2t) + b2
+      solution1 = (-numeratorLeft - numeratorMiddle + numeratorRight) / denominator
+      solution2 = (-numeratorLeft + numeratorMiddle + numeratorRight) / denominator
+      if (not isNaN solution1) and (not isNaN solution2)
+        [littleX, bigX] = if px1 < px2 then [px1, px2] else [px2, px1]
+        if (littleX <= solution1 and bigX >= solution1) or (littleX <= solution2 and bigX >= solution2)
+          return true
+      if (not isNaN solution1) or (not isNaN solution2)
+        solution = if not isNaN solution1 then solution1 else solution2
+        [littleX, bigX] = if px1 < px2 then [px1, px2] else [px2, px1]
+        if littleX <= solution and bigX >= solution
+          return true
+      else
+        return false
+    else
+      x = px1
+      x2 = Math.pow(x, 2)
+      numeratorLeft = (-a2 * h * sin2t) + (a2 * k * cos2t) + (a2 * k) + (a2 * x * sin2t)
+      numeratorMiddle = Math.SQRT2 * Math.sqrt((a4 * b2 * cos2t) + (a4 * b2) - (a2 * b4 * cos2t) + (a2 * b4) - (2 * a2 * b2 * h2) + (4 * a2 * b2 * h * x) - (2 * a2 * b2 * x2))
+      numeratorRight = (b2 * h * sin2t) - (b2 * k * cos2t) + (b2 * k) - (b2 * x * sin2t)
+      denominator = (a2 * cos2t) + a2 - (b2 * cos2t) + b2
+      solution1 = (numeratorLeft - numeratorMiddle + numeratorRight) / denominator
+      solution2 = (numeratorLeft + numeratorMiddle + numeratorRight) / denominator
+      if (not isNaN solution1) or (not isNaN solution2)
+        solution = if not isNaN solution1 then solution1 else solution2
+        [littleY, bigY] = if py1 < py2 then [py1, py2] else [py2, py1]
+        if littleY <= solution and bigY >= solution
+          return true
+      else
+        return false
+    false
+
+  intersectsRectangle: (rectangle) ->
+    rectangle.intersectsEllipse @
+
+  intersectsEllipse: (ellipse) ->
+    @rectangle().intersectsEllipse @  # TODO: actually implement ellipse-ellipse intersection
+    #return true if @containsPoint ellipse.getPos()
+
+  intersectsShape: (shape) ->
+    if shape.isEllipse then @intersectsEllipse shape else @intersectsRectangle shape
+
+  toString: ->
+    return "{x: #{@x.toFixed(0)}, y: #{@y.toFixed(0)}, w: #{@width.toFixed(0)}, h: #{@height.toFixed(0)}, rot: #{@rotation.toFixed(3)}}"
+
+  serialize: ->
+    {CN: @constructor.className, x: @x, y: @y, w: @width, h: @height, r: @rotation}
+
+  @deserialize: (o, world, classMap) ->
+    new Ellipse o.x, o.y, o.w, o.h, o.r
+
+  serializeForAether: -> @serialize()
+  @deserializeFromAether: (o) -> @deserialize o
+
+module.exports = Ellipse

app/lib/world/line_segment.coffee

@@ -0,0 +1,80 @@
+class LineSegment
+  @className: "LineSegment"
+
+  constructor: (@a, @b) ->
+    @slope = (@a.y - @b.y) / (@a.x - @b.x)
+    @y0 = @a.y - (@slope * @a.x)
+    @left = if @a.x < @b.x then @a else @b
+    @right = if @a.x > @b.x then @a else @b
+    @bottom = if @a.y < @b.y then @a else @b
+    @top = if @a.y > @b.y then @a else @b
+
+  y: (x) ->
+    (@slope * x) + @y0
+
+  x: (y) ->
+    (y - @y0) / @slope
+
+  intersectsLineSegment: (lineSegment) ->
+    if lineSegment.slope is @slope
+      if lineSegment.y0 is @y0
+        if lineSegment.left.x is @left.x or lineSegment.left.x is @right.x or lineSegment.right.x is @right.x or lineSegment.right.x is @left.x
+          # segments are of the same line with shared start and/or end points
+          return true
+        else
+          [left, right] = if lineSegment.left.x < @left.x then [lineSegment, @] else [@, lineSegment]
+          if left.right.x > right.left.x
+            # segments are of the same line and one is contained within the other
+            return true
+    else if Math.abs(@slope) isnt Infinity and Math.abs(lineSegment.slope) isnt Infinity
+      x = (lineSegment.y0 - @y0) / (@slope - lineSegment.slope)
+      if x >= @left.x and x <= @right.x and x >= lineSegment.left.x and x <= lineSegment.right.x
+        return true
+    else if Math.abs(@slope) isnt Infinity or Math.abs(lineSegment.slope) isnt Infinity
+      [vertical, nonvertical] = if Math.abs(@slope) isnt Infinity then [lineSegment, @] else [@, lineSegment]
+      x = vertical.a.x
+      bottom = vertical.bottom.y
+      top = vertical.top.y
+      y = nonvertical.y(x)
+      left = nonvertical.left.x
+      right = nonvertical.right.x
+      if y >= bottom and y <= top and x >= left and x <= right
+        return true
+    false
+
+  pointOnLine: (point, segment=true) ->
+    if point.y is @y(point.x)
+      if segment
+        [littleY, bigY] = if @a.y < @b.y then [@a.y, @b.y] else [@b.y, @a.y]
+        if littleY <= point.y and bigY >= point.y
+          return true
+      else
+        return true
+    false
+
+  distanceSquaredToPoint: (point) ->
+    # http://stackoverflow.com/a/1501725/540620
+    return @a.distanceSquared point if @a.equals @b
+    res = Math.min point.distanceSquared(@a), point.distanceSquared(@b)
+    lineMagnitudeSquared = @a.distanceSquared @b
+    t = ((point.x - @a.x) * (@b.x - @a.x) + (point.y - @a.y) * (@b.y - @a.y)) / lineMagnitudeSquared
+    return @a.distanceSquared point if t < 0
+    return @b.distanceSquared point if t > 1
+    point.distanceSquared x: @a.x + t * (@b.x - @a.x), y: @a.y + t * (@b.y - @a.y)
+
+  distanceToPoint: (point) ->
+    Math.sqrt @distanceSquaredToPoint point
+
+  toString: ->
+    "lineSegment(a=#{@a}, b=#{@b}, slope=#{@slope}, y0=#{@y0}, left=#{@left}, right=#{@right}, bottom=#{@bottom}, top=#{@top})"
+
+  serialize: ->
+    {CN: @constructor.className, a: @a, b: @b}
+
+  @deserialize: (o, world, classMap) ->
+    new LineSegment o.a, o.b
+
+  serializeForAether: -> @serialize()
+  @deserializeFromAether: (o) -> @deserialize o
+
+module.exports = LineSegment

app/lib/world/names.coffee

@@ -259,8 +259,6 @@ module.exports.thangNames = thangNames =
     'Mizzy'
     'Secka'
     'Arizard'
-    'Secka'
-    'Arizard'
     'Morzgret'
     'Doralt'
     'Geggret'

app/lib/world/rectangle.coffee

@@ -1,14 +1,16 @@
 Vector = require './vector'
+LineSegment = require './line_segment'
 
 class Rectangle
   @className: 'Rectangle'
-  # Class methods for nondestructively operating
+  # Class methods for nondestructively operating - TODO: add rotate
   for name in ['add', 'subtract', 'multiply', 'divide']
     do (name) ->
       Rectangle[name] = (a, b) ->
         a.copy()[name](b)
 
-  apiProperties: ['x', 'y', 'width', 'height', 'rotation', 'getPos', 'vertices', 'touchesRect', 'touchesPoint', 'distanceToPoint', 'containsPoint', 'copy']
+  isRectangle: true
+  apiProperties: ['x', 'y', 'width', 'height', 'rotation', 'getPos', 'vertices', 'touchesRect', 'touchesPoint', 'distanceToPoint', 'distanceSquaredToPoint', 'distanceToRectangle', 'distanceSquaredToRectangle', 'distanceToEllipse', 'distanceSquaredToEllipse', 'distanceToShape', 'distanceSquaredToShape', 'containsPoint', 'copy', 'intersectsLineSegment', 'intersectsEllipse', 'intersectsRectangle', 'intersectsShape']
 
   constructor: (@x=0, @y=0, @width=0, @height=0, @rotation=0) ->
 
@@ -28,6 +30,14 @@ class Rectangle
       new Vector @x + (w2 * cos + h2 * sin), @y + (w2 * sin - h2 * cos)
     ]
 
+  lineSegments: ->
+    vertices = @vertices()
+    lineSegment0 = new LineSegment vertices[0], vertices[1]
+    lineSegment1 = new LineSegment vertices[1], vertices[2]
+    lineSegment2 = new LineSegment vertices[2], vertices[3]
+    lineSegment3 = new LineSegment vertices[3], vertices[0]
+    [lineSegment0, lineSegment1, lineSegment2, lineSegment3]
+
   touchesRect: (other) ->
     # Whether this rect shares part of any edge with other rect, for non-rotated, non-overlapping rectangles.
     # I think it says kitty-corner rects touch, but I don't think I want that.
@@ -62,25 +72,90 @@ class Rectangle
     box
 
   distanceToPoint: (p) ->
-    # Get p in rect's coordinate space, then operate in one quadrant
+    # Get p in rect's coordinate space, then operate in one quadrant.
     p = Vector.subtract(p, @getPos()).rotate(-@rotation)
     dx = Math.max(Math.abs(p.x) - @width / 2, 0)
     dy = Math.max(Math.abs(p.y) - @height / 2, 0)
     Math.sqrt dx * dx + dy * dy
 
   distanceSquaredToPoint: (p) ->
-    # Doesn't handle rotation; just supposed to be faster than distanceToPoint
+    # Doesn't handle rotation; just supposed to be faster than distanceToPoint.
     p = Vector.subtract(p, @getPos())
     dx = Math.max(Math.abs(p.x) - @width / 2, 0)
     dy = Math.max(Math.abs(p.y) - @height / 2, 0)
     dx * dx + dy * dy
 
+  distanceToRectangle: (other) ->
+    Math.sqrt @distanceSquaredToRectangle other
+
+  distanceSquaredToRectangle: (other) ->
+    return 0 if @intersectsRectangle other
+    [firstVertices, secondVertices] = [@vertices(), other.vertices()]
+    [firstEdges, secondEdges] = [@lineSegments(), other.lineSegments()]
+    ans = Infinity
+    for i in [0 ... 4]
+      for j in [0 ... firstEdges.length]
+        ans = Math.min ans, firstEdges[j].distanceSquaredToPoint(secondVertices[i])
+      for j in [0 ... secondEdges.length]
+        ans = Math.min ans, secondEdges[j].distanceSquaredToPoint(firstVertices[i])
+    ans
+
+  distanceToEllipse: (ellipse) ->
+    Math.sqrt @distanceSquaredToEllipse ellipse
+
+  distanceSquaredToEllipse: (ellipse) ->
+    @distanceSquaredToRectangle ellipse.rectangle()  # TODO: actually implement rectangle-ellipse distance
+
+  distanceToShape: (shape) ->
+    Math.sqrt @distanceSquaredToShape shape
+
+  distanceSquaredToShape: (shape) ->
+    if shape.isEllipse then @distanceSquaredToEllipse shape else @distanceSquaredToRectangle shape
+
   containsPoint: (p, withRotation=true) ->
     if withRotation and @rotation
       not @distanceToPoint(p)
     else
       @x - @width / 2 < p.x < @x + @width / 2 and @y - @height / 2 < p.y < @y + @height / 2
 
+  intersectsLineSegment: (p1, p2) ->
+    [px1, py1, px2, py2] = [p1.x, p1.y, p2.x, p2.y]
+    m1 = (py1 - py2) / (px1 - px2)
+    b1 = py1 - (m1 * px1)
+    vertices = @vertices()
+    lineSegments = [[vertices[0], vertices[1]], [vertices[1], vertices[2]], [vertices[2], vertices[3]], [vertices[3], vertices[0]]]
+    for lineSegment in lineSegments
+      [px1, py1, px2, py2] = [p1.x, p1.y, p2.x, p2.y]
+      m2 = (py1 - py2) / (px1 - px2)
+      b2 = py1 - (m * px1)
+      if m1 isnt m2
+        m = m1 - m2
+        b = b2 - b1
+        x = b / m
+        [littleX, bigX] = if px1 < px2 then [px1, px2] else [px2, px1]
+        if x >= littleX and x <= bigX
+          y = (m1 * x) + b1
+          [littleY, bigY] = if py1 < py2 then [py1, py2] else [py2, py1]
+          if littleY <= solution and bigY >= solution
+            return true
+    false
+
+  intersectsRectangle: (rectangle) ->
+    return true if @containsPoint rectangle.getPos()
+    for thisLineSegment in @lineSegments()
+      for thatLineSegment in rectangle.lineSegments()
+        if thisLineSegment.intersectsLineSegment(thatLineSegment)
+          return true
+    false
+
+  intersectsEllipse: (ellipse) ->
+    return true if @containsPoint ellipse.getPos()
+    return true for lineSegment in @lineSegments() when ellipse.intersectsLineSegment lineSegment.a, lineSegment.b
+    false
+
+  intersectsShape: (shape) ->
+    if shape.isEllipse then @intersectsEllipse shape else @intersectsRectangle shape
+
   subtract: (point) ->
     @x -= point.x
     @y -= point.y
@@ -102,10 +177,10 @@ class Rectangle
     @
 
   isEmpty: () ->
-    @width == 0 and @height == 0
+    @width is 0 and @height is 0
 
   invalid: () ->
-    return (@x == Infinity) || isNaN(@x) || @y == Infinity || isNaN(@y) || @width == Infinity || isNaN(@width) || @height == Infinity || isNaN(@height) || @rotation == Infinity || isNaN(@rotation)
+    return (@x is Infinity) || isNaN(@x) || @y is Infinity || isNaN(@y) || @width is Infinity || isNaN(@width) || @height is Infinity || isNaN(@height) || @rotation is Infinity || isNaN(@rotation)
 
   toString: ->
     return "{x: #{@x.toFixed(0)}, y: #{@y.toFixed(0)}, w: #{@width.toFixed(0)}, h: #{@height.toFixed(0)}, rot: #{@rotation.toFixed(3)}}"

app/lib/world/thang_state.coffee

@@ -144,7 +144,7 @@ module.exports = class ThangState
           # We make sure the array keys won't collide with any string keys by using some unprintable characters.
           stringPieces = ['\x1D']  # Group Separator
           for element in value
-            if element and element.isThang
+            if element and element.id  # Was checking element.isThang, but we can't store non-strings anyway
               element = element.id
             stringPieces.push element, '\x1E'  # Record Separator(s)
           value = stringPieces.join('')

app/lib/world/vector.coffee

@@ -2,13 +2,13 @@
 class Vector
   @className: 'Vector'
   # Class methods for nondestructively operating
-  for name in ['add', 'subtract', 'multiply', 'divide', 'limit', 'normalize']
+  for name in ['add', 'subtract', 'multiply', 'divide', 'limit', 'normalize', 'rotate']
     do (name) ->
       Vector[name] = (a, b, useZ) ->
         a.copy()[name](b, useZ)
 
   isVector: true
-  apiProperties: ['x', 'y', 'z', 'magnitude', 'heading', 'distance', 'dot', 'equals', 'copy', 'distanceSquared']
+  apiProperties: ['x', 'y', 'z', 'magnitude', 'heading', 'distance', 'dot', 'equals', 'copy', 'distanceSquared', 'rotate']
 
   constructor: (@x=0, @y=0, @z=0) ->
 

app/lib/world/world.coffee

@@ -1,5 +1,7 @@
 Vector = require './vector'
 Rectangle = require './rectangle'
+Ellipse = require './ellipse'
+LineSegment = require './line_segment'
 WorldFrame = require './world_frame'
 Thang = require './thang'
 ThangState = require './thang_state'
@@ -21,7 +23,7 @@ module.exports = class World
   apiProperties: ['age', 'dt']
   constructor: (@userCodeMap, classMap) ->
     # classMap is needed for deserializing Worlds, Thangs, and other classes
-    @classMap = classMap ? {Vector: Vector, Rectangle: Rectangle, Thang: Thang}
+    @classMap = classMap ? {Vector: Vector, Rectangle: Rectangle, Thang: Thang, Ellipse: Ellipse, LineSegment: LineSegment}
     Thang.resetThangIDs()
 
     @userCodeMap ?= {}
@@ -207,7 +209,11 @@ module.exports = class World
     map = if kind is 'component' then @componentCodeClassMap else @systemCodeClassMap
     c = map[js]
     return c if c
-    c = map[js] = eval js
+    try
+      c = map[js] = eval js
+    catch err
+      console.error "Couldn't compile #{kind} code:", err, "\n", js
+      c = map[js] = {}
     c.className = name
     c
 

app/lib/world/world_utils.coffee

@@ -1,5 +1,7 @@
 Vector = require './vector'
 Rectangle = require './rectangle'
+Ellipse = require './ellipse'
+LineSegment = require './line_segment'
 Grid = require './Grid'
 
 module.exports.typedArraySupport = typedArraySupport = Float32Array?  # Not in IE until IE 10; we'll fall back to normal arrays
@@ -36,7 +38,7 @@ module.exports.clone = clone = (obj, skipThangs=false) ->
     flags += 'y' if obj.sticky?
     return new RegExp(obj.source, flags)
 
-  if (obj instanceof Vector) or (obj instanceof Rectangle)
+  if (obj instanceof Vector) or (obj instanceof Rectangle) or (obj instanceof Ellipse) or (obj instanceof LineSegment)
     return obj.copy()
 
   if skipThangs and obj.isThang

app/locale/ar.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/bg.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "български език", englishDescri
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/ca.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/cs.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     error_saving: "Chyba při ukládání"
     saved: "Změny uloženy"
     password_mismatch: "Hesla nesouhlasí."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     ambassador_join_note_desc: "Jedna z našich priorit je vytvoření vícehráčové hry, kde hráč, který má problém s řešením úrovní může oslovit a požádat o pomoc zkušenější kouzelníky. To je přesně ten případ a místo pro pomoc Velvyslance . Dáme vám vědět více!"
     more_about_ambassador: "Dozvědět se více o tom, jak se stát nápomocným Velvyslancem"
     ambassador_subscribe_desc: "Dostávat emailem oznámení a informace o vývoji v podpoře a vícehráčové hře."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-    counselor_introduction_1: "Máte životní zkušenosti? Máte odlišný náhled na věci a jste schopni nám tímto pomoci v dalším vývoji CodeCombatu? Jedna z důležitých rolí i když asi nejméně časově náročná, nicméně každá individualita je schopná udělat velký rozdíl. Hledáme zkušené odborníky, zvláště pak v oblastech vzdělávání, vývoji her managementu open source,  source project management, náboru lidských zdrojů, podnikání nebo  designu."
-    counselor_introduction_2: "Nebo cokoliv, co je relevantní ve vývoji CodeCombatu. Máte-li znalosti a jste-li ochotni se o ně podělit pro další růst tohoto projektu , pak toto je role pro vás."
-    counselor_attribute_1: "Zkušenosti ve výše zmíněných oblastech, nebo něco, čím byste mohli být nápomocni."
-    counselor_attribute_2: "Troška volného času!"
-    counselor_join_desc: "dejte nám o sobě vědět, o tom co děláte a co byste rádi dělali. Přidáme si vás do seznamu a budeme vás kontaktovat v případě, že to bude potřeba (ne moc často)."
-    more_about_counselor: "Dozvědět se více o tom, jak se stát Poradcem"
     changes_auto_save: "Změny jsou automaticky uloženy při kliknutí na zaškrtávací políčka."
     diligent_scribes: "Naši pilní Písaři:"
     powerful_archmages: "Naši mocní Arcimágové:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     diplomat_title_description: "(Překladatel)"
     ambassador_title: "Velvyslanec"
     ambassador_title_description: "(Podpora)"
-    counselor_title: "Poradce"
-    counselor_title_description: "(Odborník)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/da.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     error_saving: "Fejl under Gemning"
     saved: "Ændringer Gemt"
     password_mismatch: "Password matcher ikke."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     diplomat_title_description: "(Oversætter)"
     ambassador_title: "Ambassadør"
     ambassador_title_description: "(Brugerstøtte)"
-    counselor_title: "Rådgiver"
-    counselor_title_description: "(Ekspert/Lærer)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/de-AT.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/de-CH.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/de-DE.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     error_saving: "Fehler beim Speichern"
     saved: "Änderungen gespeichert"
     password_mismatch: "Passwörter stimmen nicht überein."
+#    password_repeat: "Please repeat your password."
     job_profile: "Jobprofil"
     job_profile_approved: "Dein Jobprofil wurde von CodeCombat freigegeben. Arbeitgeber können dieses solange einsehen, bis du es als inaktiv markiert oder wenn innerhalb von vier Wochen keine Änderung daran vorgenommen wurde."
     job_profile_explanation: "Hi! Fülle dies aus und wir melden uns bei dir bezüglich des Auffindens eines Jobs als Programmierer"
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
     what: "Was ist CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     back: "Zurück"
     revert: "Zurücksetzen"
     revert_models: "Models zurücksetzen."
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Forke neue Version"
     fork_creating: "Erzeuge Fork..."
+#    randomize: "Randomize"
     more: "Mehr"
     wiki: "Wiki"
     live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
     diligent_scribes: "Unsere fleißgen Schreiber:"
     powerful_archmages: "Unsere mächtigen Erzmagier:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     diplomat_title_description: "(Übersetzer)"
     ambassador_title: "Botschafter"
     ambassador_title_description: "(Support)"
-    counselor_title: "Berater"
-    counselor_title_description: "(Experte/Lehrer)"
 
   ladder:
     please_login: "Bitte logge dich zunächst ein, bevor du ein Ladder-Game spielst."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
     choose_opponent: "Wähle einen Gegner"
+#    select_your_language: "Select your language!"
     tutorial_play: "Spiele Tutorial"
     tutorial_recommended: "Empfohlen, wenn du noch nie zuvor gespielt hast."
     tutorial_skip: "Überspringe Tutorial"

app/locale/de.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     error_saving: "Fehler beim Speichern"
     saved: "Änderungen gespeichert"
     password_mismatch: "Passwörter stimmen nicht überein."
+#    password_repeat: "Please repeat your password."
     job_profile: "Jobprofil"
     job_profile_approved: "Dein Jobprofil wurde von CodeCombat freigegeben. Arbeitgeber können dieses solange einsehen, bis du es als inaktiv markiert oder wenn innerhalb von vier Wochen keine Änderung daran vorgenommen wurde."
     job_profile_explanation: "Hi! Fülle dies aus und wir melden uns bei dir bezüglich des Auffindens eines Jobs als Programmierer"
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
     what: "Was ist CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     back: "Zurück"
     revert: "Zurücksetzen"
     revert_models: "Models zurücksetzen."
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Forke neue Version"
     fork_creating: "Erzeuge Fork..."
+#    randomize: "Randomize"
     more: "Mehr"
     wiki: "Wiki"
     live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
     diligent_scribes: "Unsere fleißgen Schreiber:"
     powerful_archmages: "Unsere mächtigen Erzmagier:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     diplomat_title_description: "(Übersetzer)"
     ambassador_title: "Botschafter"
     ambassador_title_description: "(Support)"
-    counselor_title: "Berater"
-    counselor_title_description: "(Experte/Lehrer)"
 
   ladder:
     please_login: "Bitte logge dich zunächst ein, bevor du ein Ladder-Game spielst."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
     choose_opponent: "Wähle einen Gegner"
+#    select_your_language: "Select your language!"
     tutorial_play: "Spiele Tutorial"
     tutorial_recommended: "Empfohlen, wenn du noch nie zuvor gespielt hast."
     tutorial_skip: "Überspringe Tutorial"

app/locale/el.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
     error_saving: "Σφάλμα αποθήκευσης"
     saved: "Οι αλλαγές αποθηκεύτηκαν"
     password_mismatch: "Οι κωδικοί δεν ταιριάζουν"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
     diplomat_title_description: "(Μεταφραστής)"
     ambassador_title: "Πρεσβευτής"
     ambassador_title_description: "(Υποστήριξη)"
-    counselor_title: "Σύμβουλος"
-    counselor_title_description: "(Ειδικός/Δάσκαλος)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/en-AU.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/en-GB.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,6 +500,9 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
     randomize: "Randomise"
@@ -741,13 +745,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-    more_about_counselor: "Learn More About Becoming a Counsellor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -756,7 +753,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    translating_diplomats: "Our Translating Diplomats:"
 #    helpful_ambassadors: "Our Helpful Ambassadors:"
 
-  classes:
+#  classes:
 #    archmage_title: "Archmage"
 #    archmage_title_description: "(Coder)"
 #    artisan_title: "Artisan"
@@ -769,8 +766,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-    counselor_title: "Counsellor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -802,6 +797,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/en-US.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/en.coffee

@@ -186,6 +186,7 @@
     error_saving: "Error Saving"
     saved: "Changes Saved"
     password_mismatch: "Password does not match."
+    password_repeat: "Please repeat your password."
     job_profile: "Job Profile"
     job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
     job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@
     pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
     make_hiring_easier: "Make my hiring easier, please."
     what: "What is CodeCombat?"
-    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
     cost: "How much do we charge?"
     cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Name"
@@ -499,6 +500,9 @@
     back: "Back"
     revert: "Revert"
     revert_models: "Revert Models"
+    pick_a_terrain: "Pick A Terrain"
+    small: "Small"
+    grassy: "Grassy"
     fork_title: "Fork New Version"
     fork_creating: "Creating Fork..."
     randomize: "Randomize"
@@ -741,13 +745,6 @@
     ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
     more_about_ambassador: "Learn More About Becoming an Ambassador"
     ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-    counselor_attribute_2: "A little bit of free time!"
-    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-    more_about_counselor: "Learn More About Becoming a Counselor"
     changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
     diligent_scribes: "Our Diligent Scribes:"
     powerful_archmages: "Our Powerful Archmages:"
@@ -769,8 +766,6 @@
     diplomat_title_description: "(Translator)"
     ambassador_title: "Ambassador"
     ambassador_title_description: "(Support)"
-    counselor_title: "Counselor"
-    counselor_title_description: "(Expert/Teacher)"
 
   ladder:
     please_login: "Please log in first before playing a ladder game."
@@ -802,6 +797,7 @@
     no_ranked_matches_pre: "No ranked matches for the "
     no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
     choose_opponent: "Choose an Opponent"
+    select_your_language: "Select your language!"
     tutorial_play: "Play Tutorial"
     tutorial_recommended: "Recommended if you've never played before"
     tutorial_skip: "Skip Tutorial"

app/locale/es-419.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     error_saving: "Error al Guardar"
     saved: "Cambios Guardados"
     password_mismatch: "La contraseña no coincide."
+#    password_repeat: "Please repeat your password."
     job_profile: "Perfil de Trabajo"
     job_profile_approved: "Tu perfil de trabajo ha sido aprobado por CodeCombat. Los empleadores podrán verlo hasta que lo marques como inactivo o permanezca sin cambios por cuatro semanas."
     job_profile_explanation: "¡Hola! Llena esto, y te contactaremos acerca de encontrar un trabajo como desarrollador de software."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Nombre"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     diplomat_title_description: "(Traductor)"
     ambassador_title: "Embajador"
     ambassador_title_description: "(Soporte)"
-    counselor_title: "Consejero"
-    counselor_title_description: "(Experto/Maestro)"
 
   ladder:
     please_login: "Por favor inicia sesión antes de jugar una partida de escalera."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     no_ranked_matches_pre: "Sin partidas clasificadas para el "
     no_ranked_matches_post: " equipo! Juega en contra de algunos competidores y luego vuelve aquí para ver tu juego clasificado."
     choose_opponent: "Escoge un Oponente"
+#    select_your_language: "Select your language!"
     tutorial_play: "Juega el Tutorial"
     tutorial_recommended: "Recomendado si nunca has jugado antes"
     tutorial_skip: "Saltar Tutorial"

app/locale/es-ES.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     error_saving: "Error al guardar"
     saved: "Cambios guardados"
     password_mismatch: "La contraseña no coincide"
+#    password_repeat: "Please repeat your password."
     job_profile: "Perfil de trabajo"
     job_profile_approved: "Tu perfil de trabajo ha sido aprobado por CodeCombat. Los empleadores podrán verlo hasta que lo marques como inactivo o no haya sido cambiado durante cuatro semanas."
     job_profile_explanation: "¡Hola! Rellena esto y estaremos en contacto para hablar sobre encontrarte un trabajo como desarrollador de software."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
     what: "¿Qué es CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Nombre"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     back: "Volver"
     revert: "Revertir"
     revert_models: "Revertir Modelos"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Bifurcar nueva versión"
     fork_creating: "Creando bifurcación..."
+#    randomize: "Randomize"
     more: "Más"
     wiki: "Wiki"
     live_chat: "Chat en directo"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     ambassador_join_note_desc: "Una de nuestras principales prioridades es construir un modo multijugador donde los jugadores con mayores dificultades a la hora de resolver un nivel, puedan invocar a los magos más avanzados para que les ayuden. Será una buena manera de que los Embajadores puedan hacer su trabajo. ¡Te mantendremos informado!"
     more_about_ambassador: "Aprende más sobre cómo convertirte en un amable Embajador"
     ambassador_subscribe_desc: "Recibe correos sobre actualizaciones de soporte y desarrollo del multijugador."
-    counselor_summary: "¿Ninguno de los roles anteriores se ajusta lo que te interesa? No te preocupes, ¡estamos buscando cualquier persona que quiera echar una mano en el desarrollo de CodeCombat! Si estás interesado en la enseñanza, desarrollo de juegos, gestión de código abierto, o cualquier cosa que crees que va a ser relevante para nosotros, entonces esta clase es para tí."
-    counselor_introduction_1: "¿Tienes mucha experiencia vital? ¿Una perspectiva diferente de las cosas que nos puede ayudar a decidir cómo moldear CodeCombat? De todos estos papeles, este es el que te llevará menos tiempo pero en el que marcarás más la diferencia. Estamos buscando eruditos particularmente en áreas como: enseñanza, desarrollo de juegos, gestión de proyectos de código abierto, contratación de técnicos, iniciativa empresarial o diseño."
-    counselor_introduction_2: "O realmente cualquier cosa que sea relevante para el desarrollo de CodeCombat. Si tienes el conocimiento y quieres compartirlo para ayudar a que este proyecto crezca, entonces esta Clase es ideal para ti."
-    counselor_attribute_1: "Experiencia en cualquiera de las áreas mencionadas, o en lo que creas que puede ser de utilidad."
-    counselor_attribute_2: "¡Un poco de tiempo libre!"
-    counselor_join_desc: "cuéntanos un poco sobre ti, qué has hecho y qué estarías interesado en hacer. Te pondremos en nuestra lista de contactos y te daremos un toque cuando necesitemos consejo (no muy a menudo)."
-    more_about_counselor: "Aprende más sobre cómo convertirte en un valioso Consejero"
     changes_auto_save: "Los cambios son guardados automáticamente cuando marcas las casillas de verificación."
     diligent_scribes: "Nuestros diligentes Escribas:"
     powerful_archmages: "Nuestros poderosos Archimagos:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     diplomat_title_description: "(Traductor)"
     ambassador_title: "Embajador"
     ambassador_title_description: "(Soporte)"
-    counselor_title: "Consejero"
-    counselor_title_description: "(Experto/Profesor)"
 
   ladder:
     please_login: "Por favor inicia sesión antes de jugar una partida para el escalafón."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     no_ranked_matches_pre: "No hay partidas calificadas para "
     no_ranked_matches_post: " equipo! Juega contra otros competidores y luego vuelve aquí para que tu partida aparezca en la clasificación."
     choose_opponent: "Elige un contrincante"
+#    select_your_language: "Select your language!"
     tutorial_play: "Jugar el Tutorial"
     tutorial_recommended: "Recomendado si no has jugado antes."
     tutorial_skip: "Saltar el Tutorial"

app/locale/es.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     error_saving: "Error al guardar"
     saved: "Cambios guardados"
     password_mismatch: "La contraseña no coincide"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
   ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
     tutorial_play: "Jugar Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
     tutorial_skip: "Saltar Tutorial"

app/locale/fa.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/fi.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/fr.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     error_saving: "Problème d'enregistrement"
     saved: "Changements sauvegardés"
     password_mismatch: "Le mot de passe ne correspond pas."
+#    password_repeat: "Please repeat your password."
     job_profile: "Profil d'emploi"
     job_profile_approved: "Votre profil d'emploi a été approuvé par CodeCombat. Les employeurs seront en mesure de voir votre profil jusqu'à ce que vous le marquez inactif ou qu'il n'a pas été changé pendant quatre semaines."
     job_profile_explanation: "Salut! Remplissez-le et nous prendrons contact pour vous trouver un emploi de développeur de logiciels."
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     back: "Retour"
     revert: "Annuler"
     revert_models: "Annuler les modèles"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Fork une nouvelle version"
     fork_creating: "Créer un Fork..."
+#    randomize: "Randomize"
     more: "Plus"
     wiki: "Wiki"
     live_chat: "Chat en live"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     ambassador_join_note_desc: "Une de nos priorités est de développer un jeu multijoueur où les joueurs qui ont du mal à réussir un niveau peuvent demander de l'aide à un joueur de plus haut niveau. Ce sera un bon moyen pour que les ambassadeurs fassent leur travail. Nous vous garderons en ligne!"
     more_about_ambassador: "En apprendre plus sur comment devenir un serviable Ambassadeur"
     ambassador_subscribe_desc: "Recevoir un email sur les mises à jour de l'aide et les développements multijoueur."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-    counselor_introduction_1: "Avez-vous de l'expérience dans la vie? Ou toute autre expérience qui peut nous aider à décider comment diriger CodeCombat? De tous ces rôles, ce sera probablement celui qui prend le moins de temps, mais vous ferez la différence. Nous recherchons des sages, particulièrement dans les domaines de : l'apprentissage, le développement de jeux, la gestion de projets open source, le recrutement technique, l'entreprenariat, ou la conception."
-    counselor_introduction_2: "Ou vraiment toutes choses en rapport avec le développement de CodeCombat. Si vous avez des connaissances et que vous voulez les partager pour aider le projet à avancer, alors cette classe est faite pour vous."
-    counselor_attribute_1: "De l'expérience, dans un des domaines ci-dessus ou quelque chose que vous pensez être utile."
-    counselor_attribute_2: "Un peu de temps libre!"
-    counselor_join_desc: "parlez-nous un peu de vous, de ce que vous avez fait et ce que vous aimeriez faire. Nous vous mettrons dans notre liste de contacts et ferons appel à vous quand nous aurons besoin de conseils (pas trop souvent)."
-    more_about_counselor: "En apprendre plus sur devenir un précieux Conseiller"
     changes_auto_save: "Les changements sont sauvegardés automatiquement quand vous changez l'état des cases à cocher."
     diligent_scribes: "Nos Scribes assidus :"
     powerful_archmages: "Nos puissants Archimages :"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     diplomat_title_description: "(Traducteur)"
     ambassador_title: "Ambassadeur"
     ambassador_title_description: "(Aide)"
-    counselor_title: "Conseiller"
-    counselor_title_description: "(Expert/Professeur)"
 
   ladder:
     please_login: "Identifie toi avant de jouer à un ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     no_ranked_matches_pre: "Pas de match classé pour l'équipe "
     no_ranked_matches_post: "! Affronte d'autres compétiteurs et reviens ici pour classer ta partie."
     choose_opponent: "Choisir un Adversaire"
+#    select_your_language: "Select your language!"
     tutorial_play: "Jouer au Tutoriel"
     tutorial_recommended: "Recommendé si tu n'as jamais joué avant"
     tutorial_skip: "Passer le Tutoriel"

app/locale/he.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     error_saving: "בעיה בשמירה"
     saved: "השינויים נשמרו"
     password_mismatch: "סיסמאות לא זהות"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/hi.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/hu.coffee

@@ -173,8 +173,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     email_announcements: "Bejelentések"
     email_announcements_description: "Szeretnél levelet kapni a legújabb fejlesztéseinkről?"
     email_notifications: "Értesítések"
-#    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
-    email_any_notes: "Bármely értesítés"
+    email_notifications_summary: "CodeCombat tevékenységedre vonatkozó személyre szóló, automatikus értesítések beállításai."
+    email_any_notes: "Bármely megjegyzés"
     email_any_notes_description: "Minden tevékenységgel kapcsolatos e-mail értesítés letiltása."
     email_recruit_notes: "Álláslehetőségek"
     email_recruit_notes_description: "Ha igazán jól játszol lehet, hogy felveszzük veled a kapcsolatot és megbeszéljük, hogy szerezzünk-e neked egy (jobb) állást."
@@ -186,6 +186,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     error_saving: "Hiba a mentés során"
     saved: "Változtatások elmentve"
     password_mismatch: "A jelszavak nem egyeznek."
+#    password_repeat: "Please repeat your password."
     job_profile: "Munkaköri leírás"
     job_profile_approved: "Munkaköri leírásodat a Codecombat jóváhagyta. Munkaadók mindaddig láthatják, amíg meg nem jelölöd inaktívként, vagy négy hétig, ha addig nem kerül megváltoztatásra."
     job_profile_explanation: "Szió! Töltsd ki ezt és majd kapcsolatba lépünk veled és keresünk neked egy szoftware fejlesztői állást."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Név"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/id.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/it.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     error_saving: "Errore durante il salvataggio"
     saved: "Modifiche salvate"
     password_mismatch: "La password non corrisponde."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
     more_about_ambassador: "Leggi di più su cosa vuol dire diventare un servizievole Ambasciatore"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-    more_about_counselor: "Leggi di più su cosa vuol dire diventare un valido Consigliere"
     changes_auto_save: "Le modifiche vengono salvate automaticamente quando si segnano le caselle."
     diligent_scribes: "I nostri diligenti scrivani:"
     powerful_archmages: "I nostri potenti arcimaghi:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     diplomat_title_description: "(Traduzione)"
     ambassador_title: "Ambasciatore"
     ambassador_title_description: "(Supporto)"
-    counselor_title: "Consigliere"
-    counselor_title_description: "(Esperto/Insegnante)"
 
   ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     no_ranked_matches_pre: "Nessuna partita valutata per "
     no_ranked_matches_post: " squadra! Gioca contro altri avversari e poi torna qui affinchè la tua partita venga valutata."
     choose_opponent: "Scegli un avversario"
+#    select_your_language: "Select your language!"
     tutorial_play: "Gioca il Tutorial"
     tutorial_recommended: "Consigliato se questa è la tua primissima partita"
     tutorial_skip: "Salta il Tutorial"

app/locale/ja.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     error_saving: "セーブ中にエラーが発生しました"
     saved: "変更しました"
     password_mismatch: "パスワードが違います"
+#    password_repeat: "Please repeat your password."
     job_profile: "求職情報"
     job_profile_approved: "CodeCombatは、あなたの求職情報を承りました。無効にする、もしくは4週間の間変更をしなければ雇用者はあなたの求職情報を見ることができなくなります。"
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "名前"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     diplomat_title_description: "(翻訳者)"
 #    ambassador_title: "Ambassador"
     ambassador_title_description: "(サポート)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/ko.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     error_saving: "오류 저장"
     saved: "변경사항 저장 완료"
     password_mismatch: "비밀번호가 일치하지 않습니다."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    back: "Back"
     revert: "되돌리기"
     revert_models: "모델 되돌리기"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     diplomat_title_description: "(번역가)"
     ambassador_title: "대사"
     ambassador_title_description: "(지원)"
-    counselor_title: "카운셀러"
-    counselor_title_description: "(전문가/선생)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/lt.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/ms.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     error_saving: "Masalah menyimpan"
     saved: "Pengubahsuian disimpan"
     password_mismatch: "Kata-laluan tidak sama."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/nb.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     error_saving: "Lagring Feilet"
     saved: "Endringer Lagret"
     password_mismatch: "Passordene er ikke like."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/nl-BE.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     error_saving: "Fout Tijdens Het Opslaan"
     saved: "Aanpassingen Opgeslagen"
     password_mismatch: "Het wachtwoord komt niet overeen."
+#    password_repeat: "Please repeat your password."
     job_profile: "Job Profiel"
     job_profile_approved: "Jouw job profiel werd goedgekeurd door CodeCombat. Werkgevers zullen het kunnen bekijken totdat je het inactief zet of als er geen verandering in komt voor vier weken."
     job_profile_explanation: "Hey! Vul dit in en we zullen je contacteren om je een job als softwareontwikkelaar te helpen vinden."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Naam"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     back: "Terug"
     revert: "Keer wijziging terug"
     revert_models: "keer wijziging model terug"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Kloon naar nieuwe versie"
     fork_creating: "Kloon aanmaken..."
+#    randomize: "Randomize"
     more: "Meer"
     wiki: "Wiki"
     live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     ambassador_join_note_desc: "Een van onze topprioriteiten is om een multiplayer te bouwen waar spelers die moeite hebben een level op te lossen een tovenaar met een hoger level kunnen oproepen om te helpen. Dit zal een goede manier zijn voor ambassadeurs om hun ding te doen. We houden je op de hoogte!"
     more_about_ambassador: "Leer meer over het worden van een behulpzame Ambassadeur"
     ambassador_subscribe_desc: "Ontvang e-mails met updates over ondersteuning en multiplayer-ontwikkelingen."
-    counselor_summary: "Geen van de rollen hierboven in jouw interessegebied? Maak je geen zorgen, we zijn op zoek naar iedereen die wil helpen met het ontwikkelen van CodeCombat! Als je geïnteresseerd bent in lesgeven, gameontwikkeling, open source management of iets anders waarvan je denkt dat het relevant voor ons is, dan is dit de klasse voor jou."
-    counselor_introduction_1: "Heb jij levenservaring? Een afwijkend perspectief op zaken die ons kunnen helpen CodeCombat te vormen? Van alle rollen neemt deze wellicht de minste tijd in, maar individueel maak je misschien het grootste verschil. We zijn op zoek naar wijze tovenaars, vooral in het gebied van lesgeven, gameontwikkeling, open source projectmanagement, technische recrutering, ondernemerschap of design."
-    counselor_introduction_2: "Of eigenlijk alles wat relevant is voor de ontwikkeling van CodeCombat. Als jij kennis hebt en deze wilt dezen om dit project te laten groeien, dan is dit misschien de klasse voor jou."
-    counselor_attribute_1: "Ervaring, in enig van de bovenstaande gebieden of iets anders waarvan je denkt dat het behulpzaam zal zijn."
-    counselor_attribute_2: "Een beetje vrije tijd!"
-    counselor_join_desc: "vertel ons wat over jezelf, wat je hebt gedaan en wat je graag wilt doen. We zullen je in onze contactlijst zetten en je benaderen wanneer we je advies kunnen gebruiken (niet te vaak)."
-    more_about_counselor: "Leer meer over het worden van een waardevolle Raadgever"
     changes_auto_save: "Veranderingen worden automatisch opgeslagen wanneer je het vierkantje aan- of afvinkt."
     diligent_scribes: "Onze ijverige Klerks:"
     powerful_archmages: "Onze machtige Tovenaars:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     diplomat_title_description: "(Vertaler)"
     ambassador_title: "Ambassadeur"
     ambassador_title_description: "(Ondersteuning)"
-    counselor_title: "Raadgever"
-    counselor_title_description: "(Expert/Leraar)"
 
   ladder:
     please_login: "Log alstublieft eerst in voordat u een ladderspel speelt."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     no_ranked_matches_pre: "Geen beoordeelde wedstrijden voor het"
     no_ranked_matches_post: " team! Speel tegen enkele tegenstanders en kom terug hier om uw spel te laten beoordelen."
     choose_opponent: "Kies een tegenstander"
+#    select_your_language: "Select your language!"
     tutorial_play: "Speel de Tutorial"
     tutorial_recommended: "Aanbevolen als je nog niet eerder hebt gespeeld"
     tutorial_skip: "Sla Tutorial over"

app/locale/nl-NL.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     error_saving: "Fout Tijdens Het Opslaan"
     saved: "Aanpassingen Opgeslagen"
     password_mismatch: "Het wachtwoord komt niet overeen."
+#    password_repeat: "Please repeat your password."
     job_profile: "Job Profiel"
     job_profile_approved: "Jouw job profiel werd goedgekeurd door CodeCombat. Werkgevers zullen het kunnen bekijken totdat je het inactief zet of als er geen verandering in komt voor vier weken."
     job_profile_explanation: "Hey! Vul dit in en we zullen je contacteren om je een job als softwareontwikkelaar te helpen vinden."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Naam"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     back: "Terug"
     revert: "Keer wijziging terug"
     revert_models: "keer wijziging model terug"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Kloon naar nieuwe versie"
     fork_creating: "Kloon aanmaken..."
+#    randomize: "Randomize"
     more: "Meer"
     wiki: "Wiki"
     live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     ambassador_join_note_desc: "Een van onze topprioriteiten is om een multiplayer te bouwen waar spelers die moeite hebben een level op te lossen een tovenaar met een hoger level kunnen oproepen om te helpen. Dit zal een goede manier zijn voor ambassadeurs om hun ding te doen. We houden je op de hoogte!"
     more_about_ambassador: "Leer meer over het worden van een behulpzame Ambassadeur"
     ambassador_subscribe_desc: "Ontvang e-mails met updates over ondersteuning en multiplayer-ontwikkelingen."
-    counselor_summary: "Geen van de rollen hierboven in jouw interessegebied? Maak je geen zorgen, we zijn op zoek naar iedereen die wil helpen met het ontwikkelen van CodeCombat! Als je geïnteresseerd bent in lesgeven, gameontwikkeling, open source management of iets anders waarvan je denkt dat het relevant voor ons is, dan is dit de klasse voor jou."
-    counselor_introduction_1: "Heb jij levenservaring? Een afwijkend perspectief op zaken die ons kunnen helpen CodeCombat te vormen? Van alle rollen neemt deze wellicht de minste tijd in, maar individueel maak je misschien het grootste verschil. We zijn op zoek naar wijze tovenaars, vooral in het gebied van lesgeven, gameontwikkeling, open source projectmanagement, technische recrutering, ondernemerschap of design."
-    counselor_introduction_2: "Of eigenlijk alles wat relevant is voor de ontwikkeling van CodeCombat. Als jij kennis hebt en deze wilt dezen om dit project te laten groeien, dan is dit misschien de klasse voor jou."
-    counselor_attribute_1: "Ervaring, in enig van de bovenstaande gebieden of iets anders waarvan je denkt dat het behulpzaam zal zijn."
-    counselor_attribute_2: "Een beetje vrije tijd!"
-    counselor_join_desc: "vertel ons wat over jezelf, wat je hebt gedaan en wat je graag wilt doen. We zullen je in onze contactlijst zetten en je benaderen wanneer we je advies kunnen gebruiken (niet te vaak)."
-    more_about_counselor: "Leer meer over het worden van een waardevolle Raadgever"
     changes_auto_save: "Veranderingen worden automatisch opgeslagen wanneer je het vierkantje aan- of afvinkt."
     diligent_scribes: "Onze ijverige Klerks:"
     powerful_archmages: "Onze machtige Tovenaars:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     diplomat_title_description: "(Vertaler)"
     ambassador_title: "Ambassadeur"
     ambassador_title_description: "(Ondersteuning)"
-    counselor_title: "Raadgever"
-    counselor_title_description: "(Expert/Leraar)"
 
   ladder:
     please_login: "Log alstublieft eerst in voordat u een ladderspel speelt."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     no_ranked_matches_pre: "Geen beoordeelde wedstrijden voor het"
     no_ranked_matches_post: " team! Speel tegen enkele tegenstanders en kom terug hier om uw spel te laten beoordelen."
     choose_opponent: "Kies een tegenstander"
+#    select_your_language: "Select your language!"
     tutorial_play: "Speel de Tutorial"
     tutorial_recommended: "Aanbevolen als je nog niet eerder hebt gespeeld"
     tutorial_skip: "Sla Tutorial over"

app/locale/nl.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     error_saving: "Fout Tijdens Het Opslaan"
     saved: "Aanpassingen Opgeslagen"
     password_mismatch: "Het wachtwoord komt niet overeen."
+#    password_repeat: "Please repeat your password."
     job_profile: "Job Profiel"
     job_profile_approved: "Jouw job profiel werd goedgekeurd door CodeCombat. Werkgevers zullen het kunnen bekijken totdat je het inactief zet of als er geen verandering in komt voor vier weken."
     job_profile_explanation: "Hey! Vul dit in en we zullen je contacteren om je een job als softwareontwikkelaar te helpen vinden."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Naam"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     back: "Terug"
     revert: "Keer wijziging terug"
     revert_models: "keer wijziging model terug"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Kloon naar nieuwe versie"
     fork_creating: "Kloon aanmaken..."
+#    randomize: "Randomize"
     more: "Meer"
     wiki: "Wiki"
     live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     ambassador_join_note_desc: "Een van onze topprioriteiten is om een multiplayer te bouwen waar spelers die moeite hebben een level op te lossen een tovenaar met een hoger level kunnen oproepen om te helpen. Dit zal een goede manier zijn voor ambassadeurs om hun ding te doen. We houden je op de hoogte!"
     more_about_ambassador: "Leer meer over het worden van een behulpzame Ambassadeur"
     ambassador_subscribe_desc: "Ontvang e-mails met updates over ondersteuning en multiplayer-ontwikkelingen."
-    counselor_summary: "Geen van de rollen hierboven in jouw interessegebied? Maak je geen zorgen, we zijn op zoek naar iedereen die wil helpen met het ontwikkelen van CodeCombat! Als je geïnteresseerd bent in lesgeven, gameontwikkeling, open source management of iets anders waarvan je denkt dat het relevant voor ons is, dan is dit de klasse voor jou."
-    counselor_introduction_1: "Heb jij levenservaring? Een afwijkend perspectief op zaken die ons kunnen helpen CodeCombat te vormen? Van alle rollen neemt deze wellicht de minste tijd in, maar individueel maak je misschien het grootste verschil. We zijn op zoek naar wijze tovenaars, vooral in het gebied van lesgeven, gameontwikkeling, open source projectmanagement, technische recrutering, ondernemerschap of design."
-    counselor_introduction_2: "Of eigenlijk alles wat relevant is voor de ontwikkeling van CodeCombat. Als jij kennis hebt en deze wilt dezen om dit project te laten groeien, dan is dit misschien de klasse voor jou."
-    counselor_attribute_1: "Ervaring, in enig van de bovenstaande gebieden of iets anders waarvan je denkt dat het behulpzaam zal zijn."
-    counselor_attribute_2: "Een beetje vrije tijd!"
-    counselor_join_desc: "vertel ons wat over jezelf, wat je hebt gedaan en wat je graag wilt doen. We zullen je in onze contactlijst zetten en je benaderen wanneer we je advies kunnen gebruiken (niet te vaak)."
-    more_about_counselor: "Leer meer over het worden van een waardevolle Raadgever"
     changes_auto_save: "Veranderingen worden automatisch opgeslagen wanneer je het vierkantje aan- of afvinkt."
     diligent_scribes: "Onze ijverige Klerks:"
     powerful_archmages: "Onze machtige Tovenaars:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     diplomat_title_description: "(Vertaler)"
     ambassador_title: "Ambassadeur"
     ambassador_title_description: "(Ondersteuning)"
-    counselor_title: "Raadgever"
-    counselor_title_description: "(Expert/Leraar)"
 
   ladder:
     please_login: "Log alstublieft eerst in voordat u een ladderspel speelt."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     no_ranked_matches_pre: "Geen beoordeelde wedstrijden voor het"
     no_ranked_matches_post: " team! Speel tegen enkele tegenstanders en kom terug hier om uw spel te laten beoordelen."
     choose_opponent: "Kies een tegenstander"
+#    select_your_language: "Select your language!"
     tutorial_play: "Speel de Tutorial"
     tutorial_recommended: "Aanbevolen als je nog niet eerder hebt gespeeld"
     tutorial_skip: "Sla Tutorial over"

app/locale/nn.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/no.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     error_saving: "Lagring Feilet"
     saved: "Endringer Lagret"
     password_mismatch: "Passordene er ikke like."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/pl.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     error_saving: "Błąd zapisywania"
     saved: "Zmiany zapisane"
     password_mismatch: "Hasła róznią się od siebie"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    back: "Back"
     revert: "Przywróć"
     revert_models: "Przywróć wersję"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     ambassador_join_note_desc: "Jednym z naszych priorytetów jest zbudowanie trybu multiplayer, gdzie gracze mający problem z rozwiązywaniem poziomów będą mogli wezwać czarodziejów wyższego poziomu, by im pomogli. Będzie to świetna okazja dla Ambasadorów. Spodziewajcie się ogłoszenia w tej sprawie!"
     more_about_ambassador: "Dowiedz się więcej o stawaniu się Ambasadorem"
     ambassador_subscribe_desc: "Otrzymuj e-maile dotyczące aktualizacji wsparcia oraz rozwoju trybu multiplayer."
-    counselor_summary: "Żadna z powyższych ról nie pokrywa się z twoimi zainteresowaniami? Nie przejmuj się, poszukujemy każdego, kto chciałby dołożyć się rozwoju CodeCombat! Jeśli jestes zainteresowany nauczaniem, tworzeniem gier, zarządzaniem projektami open source lub czymkolwiek innym, co, twoim zdaniem, jest dla nas ważne, ta klasa jest dla ciebie."
-    counselor_introduction_1: "Masz doświadczenie życiowe? Inną perspektywę, która pomoże nam zdecydować, jak formować CodeCombat? Ze wszystkich wspomnianych ról, ta jest prawdopodobnie najmniej czasochłonna, ale na poziomie osobistym, to ty możesz być przyczynkiem do największych zmian. Poszukujemy oświeconych mędrców, głównie w obszarach takich jak: nauczanie, tworzenie gier, zarządzanie projektem open source, rekrutacje w sektorze technicznym, przedsiębiorczość oraz projektowanie."
-    counselor_introduction_2: "Lub cokolwiek, co jest związane z rozwojem CodeCombat. Jeśli masz wiedzę i chciałbyś się nią podzielić, by pomóc temu projektowi dojrzeć, ta klasa może być dla ciebie."
-    counselor_attribute_1: "Doświadczenie, w którymkolwiek z powyższych obszarów lub czymś, co uważasz za pomocne."
-    counselor_attribute_2: "Trochę wolnego czasu"
-    counselor_join_desc: "powiedz nam coś o sobie, o tym, czego dokonałeś i jak chciałbyś nam pomóc. Dodamy cię do naszej listy kontaktów i damy ci znać, kiedy będziemy potrzebować twojej pomocy (nie za często)."
-    more_about_counselor: "Dowiedz się więcej o stawaniu się Opiekunem"
     changes_auto_save: "Zmiany zapisują się automatycznie po kliknięci kratki."
     diligent_scribes: "Nasi pilni Skrybowie:"
     powerful_archmages: "Nasi potężni Arcymagowie:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     diplomat_title_description: "(tłumacz)"
     ambassador_title: "Ambasador"
     ambassador_title_description: "(wsparcie)"
-    counselor_title: "Opiekun"
-    counselor_title_description: "(ekspert/nauczyciel)"
 
   ladder:
     please_login: "Przed rozpoczęciem gry rankingowej musisz się zalogować."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     no_ranked_matches_pre: "Brak ocenionych pojedynków dla drużyny "
     no_ranked_matches_post: " ! Zagraj przeciwko kilku oponentom i wróc tutaj, aby uzyskać ocenę gry."
     choose_opponent: "Wybierz przeciwnika"
+#    select_your_language: "Select your language!"
     tutorial_play: "Rozegraj samouczek"
     tutorial_recommended: "Zalecane, jeśli wcześniej nie grałeś"
     tutorial_skip: "Pomiń samouczek"

app/locale/pt-BR.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     error_saving: "Erro no salvamento"
     saved: "Alterações Salvas"
     password_mismatch: "As senhas não estão iguais"
+#    password_repeat: "Please repeat your password."
     job_profile: "Perfil de trabalho"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    back: "Back"
     revert: "Reverter"
     revert_models: "Reverter Modelos"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
     more: "Mais"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     ambassador_join_note_desc: "Uma das nossas principais prioridades é a construção de um multiplayer onde os jogadores que estão com dificuldade para resolver um nível podem invocar feitiçeiros com nível mais alto para ajudá-los. Esta será uma ótima maneira para os embaixadores fazerem suas tarefas. Vamos mantê-lo informado!"
     more_about_ambassador: "Saiba Mais Sobre Como Se Tornar Um Embaixador Prestativo"
     ambassador_subscribe_desc: "Receba emails sobre atualização do suporte e desenvolvimento do multiplayer."
-    counselor_summary: "Nenhum dos papéis acima se adequa ao que você está interessado? Não se preocupe, estamos à procura de todos que querem dar uma mão no desenvolvimento do CodeCombat! Se você está interessando no ensino, desenvolvimento de jogos, gerenciamento de código-fonte aberto, ou qualquer outra coisa que você ache que será relevante para nós, então essa classe é para você."
-    counselor_introduction_1: "Você tem experiência de vida? Uma perspectiva diferente sobre as coisas podem nos ajudar a decidir como moldar o CodeCombat? De todos os papéis, este provavelmente vai demorar menos tempo, mas individualmente você pode fazer mais diferença. Estamos à procura de sábios, particularmente em áreas como: ensino, desenvolvimento de jogos, gerenciamente de projetos de código aberto, recrutamento técnico, empreendedorismo ou design."
-    counselor_introduction_2: "Ou realmente tudo o que é relevante para o desenvolvimento do CodeCombat. Se você tem conhecimento e quer compartilhá-lo para ajudar este projeto a crescer, esta classe pode ser para você."
-    counselor_attribute_1: "Experiência, em qualquer uma das áreas acima ou alguma coisa que você pense ser útil."
-    counselor_attribute_2: "Um pouco de tempo livre!"
-    counselor_join_desc: "conte-nos um pouco sobre você, o que você fez e o que você estaria interessado em fazer. Vamos colocá-lo em nossa lista de contatos e entraremos em contato quando precisarmos de um conselho (não muitas vezes)."
-    more_about_counselor: "Saiba Mais Sobre Como Se Tornar Um Conselheiro Valioso"
     changes_auto_save: "As alterações são salvas automaticamente quando você marcar as caixas de seleção."
     diligent_scribes: "Nossos Aplicados Escribas:"
     powerful_archmages: "Nossos Poderosos Arquimagos:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     diplomat_title_description: "(Tradutor)"
     ambassador_title: "Embaixador"
     ambassador_title_description: "(Suporte)"
-    counselor_title: "Conselheiro"
-    counselor_title_description: "(Especialista/Professor)"
 
   ladder:
     please_login: "Por favor entre antes de jogar uma partida classificatória."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     no_ranked_matches_pre: "Sem partidas classificadas para o "
     no_ranked_matches_post: " time! Jogue contra alguns competidores e então volte aqui para ter seu jogo classificado."
     choose_opponent: "Escolha um Oponente"
+#    select_your_language: "Select your language!"
     tutorial_play: "Jogue o Tutorial"
     tutorial_recommended: "Recomendado se você nunca jogou antes"
     tutorial_skip: "Pular Tutorial"

app/locale/pt-PT.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     error_saving: "Erro ao Guardar"
     saved: "Alterações Guardadas"
     password_mismatch: "As palavras-passe não coincidem."
+#    password_repeat: "Please repeat your password."
     job_profile: "Perfil de Emprego"
     job_profile_approved: "O seu perfil de emprego foi aprovado pelo CodeCombat. Os empregadores poderão vê-lo até que o defina como inativo ou não o tenha alterado à 4 semanas."
     job_profile_explanation: "Olá! Preencha isto e entraremos em contacto consigo sobre encontrar um emprego de desenvolvedor de software para si."
@@ -475,32 +476,36 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     lg_title: "Últimos Jogos"
 #    clas: "CLAs"
 
-#  community:
-#    level_editor: "Level Editor"
-#    main_title: "CodeCombat Community"
-#    facebook: "Facebook"
-#    twitter: "Twitter"
-#    gplus: "Google+"
+  community:
+    level_editor: "Editor de Níveis"
+    main_title: "Comunidade do CodeCombat"
+    facebook: "Facebook"
+    twitter: "Twitter"
+    gplus: "Google+"
 
   editor:
-    main_title: "Editores para CodeCombat"
-    main_description: "Constrói os teus níveis, campanhas, unidades e conteúdo educacional. Nós fornecemos todas as ferramentas que precisas!"
+    main_title: "Editores do CodeCombat"
+    main_description: "Construa os seus próprios níveis, campanhas, unidades e conteúdo educacional. Nós fornecemos todas as ferramentas de que precisa!"
     article_title: "Editor de Artigos"
-    article_description: "Escreve artigos que dêem aos jogadores uma visão geral dos conceitos de programação que podem ser usados nos mais diversos níveis e campanhas."
-    thang_title: "Editor de Thang"
-    thang_description: "Constrói unidades, definindo a sua logica, visual e audio por defeito. De momento só é suportado 'importing Flash exported vector graphics'."
-    level_title: "Editor de níveis"
-    level_description: "Inclui ferramentas para a criação de scripts, upload de áudio, e construção de lógica personalizada para criar todos os tipos de níveis. Tudo o que nós usamos!"
-#    achievement_title: "Achievement Editor"
-#    got_questions: "Questions about using the CodeCombat editors?"
-    contact_us: "contacta-nos!"
-    hipchat_prefix: "Podes encontrar-nos no nosso"
-    hipchat_url: "canal HipChat."
+    article_description: "Escreva artigos que deem aos jogadores visões gerais de conceitos da programação, que podem ser usados numa variedade de níveis e campanhas."
+    thang_title: "Editor de Thangs"
+    thang_description: "Construa unidades, definindo a lógica, o visual e o áudio delas. De momento só é suportada a importação de visuais vetoriais exportados do Flash."
+    level_title: "Editor de Níveis"
+    level_description: "Inclui as ferramentas para criar scripts, importar áudio e construir lógica personalizada para criar todos os tipos de níveis. Tudo o que nós usamos!"
+    achievement_title: "Editor de Conquistas"
+    got_questions: "Questões sobre o uso dos editores do CodeCombat?"
+    contact_us: "Contacte-nos!"
+    hipchat_prefix: "Pode também encontrar-nos na nossa"
+    hipchat_url: "sala HipChat."
 #    back: "Back"
     revert: "Reverter"
     revert_models: "Reverter Modelos"
+    pick_a_terrain: "Escolha Um Terreno"
+    small: "Pequeno"
+    grassy: "Com Relva"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -510,10 +515,10 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     level_tab_settings: "Configurações"
     level_tab_components: "Componentes"
     level_tab_systems: "Sistemas"
-    level_tab_thangs_title: "Thangs atuais"
-#    level_tab_thangs_all: "All"
-    level_tab_thangs_conditions: "Condições iniciais"
-    level_tab_thangs_add: "Adiciona Thangs"
+    level_tab_thangs_title: "Thangs Atuais"
+    level_tab_thangs_all: "Todos"
+    level_tab_thangs_conditions: "Condições Iniciais"
+    level_tab_thangs_add: "Adicionar Thangs"
 #    delete: "Delete"
 #    duplicate: "Duplicate"
     level_settings_title: "Configurações"
@@ -540,13 +545,13 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    new_achievement_title: "Create a New Achievement"
 #    new_achievement_title_login: "Log In to Create a New Achievement"
     article_search_title: "Procurar Artigos Aqui"
-    thang_search_title: "Procurar Tipos de Thang Aqui"
+    thang_search_title: "Procurar Thangs Aqui"
     level_search_title: "Procurar Níveis Aqui"
 #    achievement_search_title: "Search Achievements"
 #    read_only_warning2: "Note: you can't save any edits here, because you're not logged in."
 
   article:
-    edit_btn_preview: "Visualizar"
+    edit_btn_preview: "Pré-visualizar"
     edit_article_title: "Editar Artigo"
 
   general:
@@ -577,7 +582,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     easy: "Fácil"
     medium: "Médio"
     hard: "Difícil"
-#    player: "Player"
+    player: "Jogador"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -663,8 +668,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
 
-#  contribute:
-#    page_title: "Contributing"
+  contribute:
+    page_title: "Contribuir"
 #    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
@@ -687,7 +692,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    join_desc_4: "and we'll go from there!"
 #    join_url_email: "Email us"
 #    join_url_hipchat: "public HipChat room"
-#    more_about_archmage: "Learn More About Becoming an Archmage"
+    more_about_archmage: "Aprenda Mais Sobre Tornar-se um Arcomago"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
 #    artisan_summary_suf: ", then this class is for you."
@@ -701,7 +706,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    artisan_join_step2: "Create a new level and explore existing levels."
 #    artisan_join_step3: "Find us in our public HipChat room for help."
 #    artisan_join_step4: "Post your levels on the forum for feedback."
-#    more_about_artisan: "Learn More About Becoming an Artisan"
+    more_about_artisan: "Aprenda Mais Sobre Tornar-se um Artesão"
 #    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
 #    adventurer_summary: "Let us be clear about your role: you are the tank. You are going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class is for you."
 #    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
@@ -710,7 +715,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
 #    adventurer_forum_url: "our forum"
 #    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    more_about_adventurer: "Learn More About Becoming an Adventurer"
+    more_about_adventurer: "Aprenda Mais Sobre Tornar-se um Aventureiro"
 #    adventurer_subscribe_desc: "Get emails when there are new levels to test."
 #    scribe_summary_pref: "CodeCombat is not just going to be a bunch of levels. It will also be a resource of programming knowledge that players can hook into. That way, each Artisan can link to a detailed article that for the player's edification: documentation akin to what the "
 #    scribe_summary_suf: " has built. If you enjoy explaining programming concepts, then this class is for you."
@@ -720,7 +725,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    scribe_attribute_1: "Skill in words is pretty much all you need. Not only grammar and spelling, but able to convey complicated ideas to others."
 #    contact_us_url: "Contact us"
 #    scribe_join_description: "tell us a little about yourself, your experience with programming and what sort of things you'd like to write about. We'll go from there!"
-#    more_about_scribe: "Learn More About Becoming a Scribe"
+    more_about_scribe: "Aprenda Mais Sobre Tornar-se um Escrivão"
 #    scribe_subscribe_desc: "Get emails about article writing announcements."
 #    diplomat_summary: "There is a large interest in CodeCombat in other countries that do not speak English! We are looking for translators who are willing to spend their time translating the site's corpus of words so that CodeCombat is accessible across the world as soon as possible. If you'd like to help getting CodeCombat international, then this class is for you."
 #    diplomat_introduction_pref: "So, if there's one thing we learned from the "
@@ -730,7 +735,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    diplomat_join_pref_github: "Find your language locale file "
 #    diplomat_github_url: "on GitHub"
 #    diplomat_join_suf_github: ", edit it online, and submit a pull request. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    more_about_diplomat: "Learn More About Becoming a Diplomat"
+    more_about_diplomat: "Aprenda Mais Sobre Tornar-se um Diplomata"
 #    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
 #    ambassador_summary: "We are trying to build a community, and every community needs a support team when there are troubles. We have got chats, emails, and social networks so that our users can get acquainted with the game. If you want to help people get involved, have fun, and learn some programming, then this class is for you."
 #    ambassador_introduction: "This is a community we're building, and you are the connections. We've got Olark chats, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
@@ -738,26 +743,19 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
 #    ambassador_join_note_strong: "Note"
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-#    more_about_ambassador: "Learn More About Becoming an Ambassador"
+    more_about_ambassador: "Aprenda Mais Sobre Tornar-se um Embaixador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
-#    diligent_scribes: "Our Diligent Scribes:"
-#    powerful_archmages: "Our Powerful Archmages:"
-#    creative_artisans: "Our Creative Artisans:"
-#    brave_adventurers: "Our Brave Adventurers:"
-#    translating_diplomats: "Our Translating Diplomats:"
-#    helpful_ambassadors: "Our Helpful Ambassadors:"
+    diligent_scribes: "Os Nossos Dedicados Escrivões:"
+    powerful_archmages: "Os Nossos Poderosos Arcomagos:"
+    creative_artisans: "Os Nossos Creativos Artesãos:"
+    brave_adventurers: "Os Nossos Bravos Aventureiros:"
+    translating_diplomats: "Os Nossos Tradutores Diplomatas:"
+    helpful_ambassadors: "Os Nossos Prestáveis Embaixadores:"
 
   classes:
-#    archmage_title: "Archmage"
-#    archmage_title_description: "(Coder)"
+    archmage_title: "Arcomago"
+    archmage_title_description: "(Programador)"
     artisan_title: "Artesão"
     artisan_title_description: "(Construtor de Níveis)"
     adventurer_title: "Aventureiro"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     diplomat_title_description: "(Tradutor)"
     ambassador_title: "Embaixador"
     ambassador_title_description: "(Suporte)"
-    counselor_title: "Conselheiro"
-    counselor_title_description: "(Especialista/Professor)"
 
   ladder:
     please_login: "Por favor, faz log in antes de jogar um jogo para o campeonato."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     no_ranked_matches_pre: "Sem jogos classificados pela equipa "
     no_ranked_matches_post: "! Joga contra alguns adversários e volta aqui para veres o teu jogo classificado."
     choose_opponent: "Escolhe um Adversário"
+#    select_your_language: "Select your language!"
     tutorial_play: "Jogar Tutorial"
     tutorial_recommended: "Recomendado se nunca jogaste antes"
     tutorial_skip: "Saltar Tutorial"

app/locale/pt.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     error_saving: "Erro no salvamento"
     saved: "Alterações Salvas"
     password_mismatch: "As senhas não estão iguais"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/ro.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     error_saving: "Salvare erori"
     saved: "Modificări salvate"
     password_mismatch: "Parola nu se potrivește."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    back: "Back"
     revert: "Revino la versiunea anterioară"
     revert_models: "Resetează Modelele"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-    more_about_counselor: "Află mai multe despre ce înseamna să devi Consilier"
     changes_auto_save: "Modificările sunt salvate automat când apeși checkbox-uri."
     diligent_scribes: "Scribii noștri:"
     powerful_archmages: "Bravii noștri Archmage:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     diplomat_title_description: "(Translator)"
     ambassador_title: "Ambasador"
     ambassador_title_description: "(Suport)"
-    counselor_title: "Consilier"
-    counselor_title_description: "(Expert/Profesor)"
 
   ladder:
     please_login: "Vă rugăm să vă autentificați înainte de a juca un meci de clasament."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     no_ranked_matches_pre: "Nici un meci de clasament pentru "
     no_ranked_matches_post: " echipă! Joacă împotriva unor concurenți și revino apoi aici pentr a-ți plasa meciul in clasament."
     choose_opponent: "Alege un adversar"
+#    select_your_language: "Select your language!"
     tutorial_play: "Joacă Tutorial-ul"
     tutorial_recommended: "Recomandat dacă nu ai mai jucat niciodată înainte"
     tutorial_skip: "Sari peste Tutorial"

app/locale/ru.coffee

@@ -173,7 +173,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     email_announcements: "Оповещения"
     email_announcements_description: "Получать email-оповещения о последних новостях CodeCombat."
     email_notifications: "Уведомления"
-#    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
+    email_notifications_summary: "Настройки автоматических email-уведомлений, основанных на вашей активности на CodeCombat."
     email_any_notes: "Все уведомления"
     email_any_notes_description: "Отключите, чтобы больше не получать извещения."
     email_recruit_notes: "Возможности для работы"
@@ -186,6 +186,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     error_saving: "Ошибка сохранения"
     saved: "Изменения сохранены"
     password_mismatch: "Пароли не совпадают."
+#    password_repeat: "Please repeat your password."
     job_profile: "Профиль соискателя"
     job_profile_approved: "Ваш профиль соискателя был одобрен CodeCombat. Работодатели смогут видеть его, пока вы не отметите его неактивным или он не будет изменен в течение четырёх недель."
     job_profile_explanation: "Привет! Заполните это, и мы свяжемся с вами при нахождении работы разработчика программного обеспечения для вас."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Имя"
@@ -399,8 +400,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     editor_config_keybindings_label: "Сочетания клавиш"
     editor_config_keybindings_default: "По умолчанию (Ace)"
     editor_config_keybindings_description: "Добавляет дополнительные сочетания, известные из популярных редакторов."
-#    editor_config_livecompletion_label: "Live Autocompletion"
-#    editor_config_livecompletion_description: "Displays autocomplete suggestions while typing."
+    editor_config_livecompletion_label: "Автозаполнение"
+    editor_config_livecompletion_description: "Отображение вариантов автозаполнения во время печати."
     editor_config_invisibles_label: "Показывать непечатные символы"
     editor_config_invisibles_description: "Отображение непечатных символов, таких как пробелы или табуляции."
     editor_config_indentguides_label: "Показывать направляющие отступов"
@@ -451,8 +452,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     enter: "Enter"
     escape: "Escape"
     cast_spell: "Произнести текущее заклинание."
-#    continue_script: "Continue past current script."
-#    skip_scripts: "Skip past all skippable scripts."
+    continue_script: "Продолжить текущий скрипт."
+    skip_scripts: "Пропустить все возможные скрипты."
     toggle_playback: "Переключить проигрывание/паузу."
     scrub_playback: "Перемотка назад и вперед во времени."
 #    single_scrub_playback: "Scrub back and forward through time by a single frame."
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     back: "Назад"
     revert: "Откатить"
     revert_models: "Откатить Модели"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Форк новой версии"
     fork_creating: "Создание форка..."
+#    randomize: "Randomize"
     more: "Ещё"
     wiki: "Вики"
     live_chat: "Онлайн-чат"
@@ -535,10 +540,10 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     new_thang_title: "Создать новый тип объектов"
     new_level_title: "Создать новый уровень"
     new_article_title_login: "Войти, чтобы создать новую статью"
-#    new_thang_title_login: "Log In to Create a New Thang Type"
-    new_level_title_login: "Войти чтобы создать новый уровень"
-#    new_achievement_title: "Create a New Achievement"
-#    new_achievement_title_login: "Log In to Create a New Achievement"
+    new_thang_title_login: "Войти, чтобы создать новый тип объектов"
+    new_level_title_login: "Войти, чтобы создать новый уровень"
+    new_achievement_title: "Создать новое достижение"
+    new_achievement_title_login: "Войти, чтобы создать новое достижение"
     article_search_title: "Искать статьи"
     thang_search_title: "Искать типы объектов"
     level_search_title: "Искать уровни"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     ambassador_join_note_desc: "Одним из наших главных приоритетов является создание мультиплеера, где игроки столкнутся с труднорешаемыми уровнями и могут призвать более высокоуровневых волшебников для помощи. Это будет отличным способом для послов делать свое дело. Мы будем держать вас в курсе!"
     more_about_ambassador: "Узнать больше о том, как стать Послом"
     ambassador_subscribe_desc: "Получать email-ы о разработке мультиплеера и обновлениях в системе поддержки."
-    counselor_summary: "Ни одна из вышеупомянутых ролей не соответствует тому, в чём вы заинтересованы? Не волнуйтесь, мы в поисках тех, кто хочет приложить руку к разработке CodeCombat! Если вы заинтересованы в обучении, разработке игр, управлением проектами с открытым исходным кодом, или в чём-нибудь ещё, что, как вы думаете, будет актуально для нас, то этот класс для вас."
-    counselor_introduction_1: "У вас есть жизненный опыт? Другая точка зрения на вещи, которые могут помочь нам решить, как формировать CodeCombat? Из всех этих ролей, эта, возможно, займёт меньше всего времени, но по отдельности, вы можете сделать наибольшие изменения. Мы в поисках морщинистых мудрецов, особенно в таких областях, как: обучение, разработка игр, управление проектами с открытым исходным кодом, технической рекрутинг, предпринимательство или дизайн."
-    counselor_introduction_2: "Или действительно всё, что имеет отношение к развитию CodeCombat. Если у вас есть знания и вы хотите поделиться ими, чтобы помочь вырастить этот проект, то этот класс для вас."
-    counselor_attribute_1: "Опыт, в любой из областей выше, или в том, что, как вы думаете, может быть полезным."
-    counselor_attribute_2: "Немного свободного времени!"
-    counselor_join_desc: "расскажите нам немного о себе, чем вы занимались и чем хотели бы заниматься. Мы поместим вас в наш список контактов и выйдем на связь, когда нам понадобится совет(не слишком часто)."
-    more_about_counselor: "Узнать больше о том, как стать Советником"
     changes_auto_save: "Изменения сохраняются автоматически при переключении флажков."
     diligent_scribes: "Наши старательные Писари:"
     powerful_archmages: "Наши могущественные Архимаги:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     diplomat_title_description: "(переводчик)"
     ambassador_title: "Посол"
     ambassador_title_description: "(поддержка)"
-    counselor_title: "Советник"
-    counselor_title_description: "(эксперт/учитель)"
 
   ladder:
     please_login: "Пожалуйста, перед игрой для ладдера, войдите в аккаунт."
@@ -795,12 +791,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     rank_submitted: "Отправлено для оценки"
     rank_failed: "Сбой в оценке"
     rank_being_ranked: "Игра оценивается"
-#    rank_last_submitted: "submitted "
-#    help_simulate: "Help simulate games?"
+    rank_last_submitted: "отправлено "
+    help_simulate: "Нужна помощь в симуляции игр?"
     code_being_simulated: "Ваш новый код участвует в симуляции других игроков для оценки. Обновление будет при поступлении новых матчей."
     no_ranked_matches_pre: "Нет оценённых матчей для команды"
     no_ranked_matches_post: "! Сыграйте против нескольких противников и возвращайтесь сюда для оценки вашей игры."
     choose_opponent: "Выберите противника"
+#    select_your_language: "Select your language!"
     tutorial_play: "Пройти обучение"
     tutorial_recommended: "Рекомендуется, если вы раньше никогда не играли"
     tutorial_skip: "Пропустить обучение"
@@ -809,19 +806,19 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     simple_ai: "Простой ИИ"
     warmup: "Разминка"
     vs: "против"
-#    friends_playing: "Friends Playing"
-#    log_in_for_friends: "Log in to play with your friends!"
-#    social_connect_blurb: "Connect and play against your friends!"
+    friends_playing: "Друзья в игре"
+    log_in_for_friends: "Войти, чтобы поиграть с друзьями!"
+    social_connect_blurb: "Свяжите учетную запись и  играйте против друзей!"
     invite_friends_to_battle: "Пригласить друзей присоединиться к вам в сражении!"
     fight: "В бой!"
-#    watch_victory: "Watch your victory"
-#    defeat_the: "Defeat the"
-#    tournament_ends: "Tournament ends"
-#    tournament_ended: "Tournament ended"
-#    tournament_rules: "Tournament Rules"
-#    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
-#    tournament_blurb_blog: "on our blog"
-#    rules: "Rules"
+    watch_victory: "Наблюдать за победой"
+    defeat_the: "Победить"
+    tournament_ends: "Турнир заканчивается"
+    tournament_ended: "Турнир закончился"
+    tournament_rules: "Правила турнира"
+    tournament_blurb: "Пишите код, собирайте золото, стройте армию, крушите противников, получайте призы и улучшайте вашу карьеру в нашем \"$40,000 турнире жадности\"! Узнайте больше"
+    tournament_blurb_blog: "в нашем блоге"
+    rules: "Правила"
     winners: "Победители"
 
 #  ladder_prizes:

app/locale/sk.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     error_saving: "Chyba pri ukladaní"
     saved: "Zmeny uložené"
     password_mismatch: "Heslá nesedia."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/sl.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/sr.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     error_saving: "Чување грешке..."
     saved: "Измене су сачуване"
     password_mismatch: "Шифре се не слажу."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/sv.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     error_saving: "Ett fel uppstod när ändringarna skulle sparas"
     saved: "Ändringar sparade"
     password_mismatch: "De angivna lösenorden stämmer inte överens."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    back: "Back"
     revert: "Återställ"
     revert_models: "Återställ modeller"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     ambassador_join_note_desc: "En av våra högsta prioriteringar är att bygga ett flerspelarläge där spelare som har problem med att lösa nivåer kan kalla på trollkarlar av en högre nivå för att hjälpa dem. Det kommer att vara ett jättebra sätt för ambassadörer att göra sin grej. Vi håller dig informerad!"
     more_about_ambassador: "Lär dig mer om att bli en ambassadör"
     ambassador_subscribe_desc: "Få mail om supportuppdateringar och flerspelarutvecklingar"
-    counselor_summary: "Passar ingen av rollerna ovanför det du är intresserad av? Oroa dig inte, vi håller utkik efter alla som vill vara inblandade i utvecklingen av CodeCombat! Om du är intresserad av undervisning, spelutveckling, skötsel av öppen programvara eller någonting annat som du tror skulle vara relevent för oss, är det här klassen för dig."
-    counselor_introduction_1: "Har du livserfarenhet? Ett annat perspektiv på saker som kan hjälpa oss besluta hur vi ska forma CodeCombat? Av alla dessa roller kommer förmodligen denna ta minst tid, men individuellt kommer du att göra störst skillnad. Vi letar efter skrynkliga visa människor, särskilt inom områden som: undervisning, spelutveckling, skötsel av öppen programvara, teknisk rekrytering, entrepenörskap eller design."
-    counselor_introduction_2: "Eller egentligen vad som helst som är relevant för CodeCombats utveckling. Om du har kunskap och vill dela med dig av den för att hjälpa det här projektet att växa, är kanske det här klassen för dig."
-    counselor_attribute_1: "Erfarenhet, i ett av områdena ovan eller någonting annat du tror kan vara hjälpsamt."
-    counselor_attribute_2: "Lite fritid!"
-    counselor_join_desc: "berätta om dig själv, vad har du gjort och vad skulle du vara intresserad av att göra. Vi lägger dig i vår kontaktlista och hör av oss när vi behöver råd (inte alltför ofta)"
-    more_about_counselor: "Lär dig mer om att bli en skritflärd"
     changes_auto_save: "Förändringar sparas automatiskt när du ändrar kryssrutor."
     diligent_scribes: "Våra flitiga skriftlärda:"
     powerful_archmages: "Våra kraftfulla huvudmagiker:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     diplomat_title_description: "(Översättare)"
     ambassador_title: "Ambassadör"
     ambassador_title_description: "(Support)"
-    counselor_title: "Rådgivare"
-    counselor_title_description: "(Expert/Lärare)"
 
   ladder:
     please_login: "Var vänlig logga in innan du spelar en stegmatch."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     no_ranked_matches_pre: "Inga rankade matcher för "
     no_ranked_matches_post: " laget! Spela mot några motståndare och kom sedan tillbaka it för att få din match rankad."
     choose_opponent: "Välj en motståndare"
+#    select_your_language: "Select your language!"
     tutorial_play: "Spela tutorial"
     tutorial_recommended: "Rekommenderas om du aldrig har spelat tidigare"
     tutorial_skip: "Hoppa över tutorial"

app/locale/th.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     error_saving: "บันทึกผิดพลาด"
     saved: "เปลี่ยนรหัสผ่าน"
     password_mismatch: "รหัสผ่านไม่ถูกต้อง"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/tr.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     error_saving: "Kayıt Esnasında Hata"
     saved: "Değişiklikler Kaydedildi"
     password_mismatch: "Şifreler Uyuşmuyor"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    back: "Back"
     revert: "Geri al"
     revert_models: "Önceki Modeller"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     diplomat_title_description: "(Çevirmen)"
     ambassador_title: "Büyükelçi"
     ambassador_title_description: "(Support)"
-    counselor_title: "Danışman"
-    counselor_title_description: "(Uzman/Öğretmen)"
 
   ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/uk.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
     error_saving: "Помилка при збереженні"
     saved: "Зміни збережено"
     password_mismatch: "Паролі не збігаються."
+#    password_repeat: "Please repeat your password."
     job_profile: "Профіль роботи"
     job_profile_approved: "Ваш робочий пофіль буде затверджений CodeCombat. Роботодавці зможуть бачити його якщо він буде відмічений як активний, або він не зазнає змін протягом 4 тижнів."
     job_profile_explanation: "Привіт! Заповніть це і ми з Вами зв‘яжемось знайшовши для Вас роботу розробника ПЗ."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "Ім‘я"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "українська мова", englishDesc
     back: "Назад"
     revert: "Повернутись"
     revert_models: "Моделі повернення"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "Нова версія Форк"
     fork_creating: "Створення Форк..."
+#    randomize: "Randomize"
     more: "Більше"
     wiki: "Wiki"
     live_chat: "Online чат"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
     more_about_ambassador: "Дізнатися, як стати Посланцем"
     ambassador_subscribe_desc: "Отримувати листи з новинами щодо підтримки користувачів та розробки мультиплеєра."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-    more_about_counselor: "Дізнатися, як стати Радником"
     changes_auto_save: "Зміни зберігаються автоматично, коли ви ставите позначку у чекбоксі."
     diligent_scribes: "Наші старанні Писарі:"
     powerful_archmages: "Наші могутні Архімаги:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "українська мова", englishDesc
     diplomat_title_description: "(Перекладач)"
     ambassador_title: "Посланець"
     ambassador_title_description: "(Підтримка)"
-    counselor_title: "Радник"
-    counselor_title_description: "(Експерт/Вчитель)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/ur.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/vi.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     error_saving: "Lỗi lưu"
     saved: "Thay đổi được lưu"
     password_mismatch: "Mật khẩu không khớp."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -663,7 +668,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
 
-  contribute:
+#  contribute:
 #    page_title: "Contributing"
 #    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-    counselor_attribute_2: "Rảnh rỗi một chút!"
-    counselor_join_desc: "Nói cho chúng tôi điều gì đó về bạn, bạn đã làm cái gì và bạn hứng thú về cái gì. Chúng tôi sẽ đưa bạn vào danh sách liên lạc và chúng tôi sẽ liên hệ khi chúng tôi có thể(không thường xuyên)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     diplomat_title_description: "(Người phiên dịch)"
 #    ambassador_title: "Ambassador"
     ambassador_title_description: "(Hỗ trợ)"
-    counselor_title: "Người tư vấn"
-    counselor_title_description: "(Chuyên gia/ Giáo viên)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/zh-HANS.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     error_saving: "保存时出错"
     saved: "更改已保存"
     password_mismatch: "密码不匹配。"
+#    password_repeat: "Please repeat your password."
     job_profile: "工作经历"
     job_profile_approved: "你填写的工作经历将由CodeCombat认证. 雇主将看到这些信息，除非你将它设置为不启用状态或者连续四周没有更新."
     job_profile_explanation: "你好! 填写这些信息, 我们将使用它帮你寻找一份软件开发的工作."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "姓名"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     back: "后退"
     revert: "还原"
     revert_models: "还原模式"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "派生新版本"
     fork_creating: "正在执行派生..."
+#    randomize: "Randomize"
     more: "更多"
     wiki: "维基"
     live_chat: "在线聊天"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
     more_about_ambassador: "了解如何成为一名使节"
     ambassador_subscribe_desc: "通过电子邮件获得支持系统的现状，以及多人游戏方面的新进展。"
-    counselor_summary: "以上的职业都不适合你？没关系，我们欢迎每一个想参与 CodeCombat 开发的人！如果你熟悉教学、游戏开发、开源管理，或者任何你觉得和我们有关的方面，那这个职业属于你。"
-    counselor_introduction_1: "也许你有人生的经验，也许你对 CodeCombat 的发展有独特的观点。在所有这些角色中，这个角色花费的时间可能最少，但作为个人你的价值却最高。我们在寻找各方面的贤人，尤其是在教学、游戏开发、开源软件管理、技术企业招聘、创业或者设计方面的。"
-    counselor_introduction_2: "任何和 CodeCombat 的开发有关系的又可以。如果你有知识，并且希望分享给我们，帮这个项目成长，那这个职业属于你。"
-    counselor_attribute_1: "经验。上述的任何领域，或者你认为对我们有帮助的领域。"
-    counselor_attribute_2: "一点用来谈笑风生的时间！"
-    counselor_join_desc: "，向我们介绍以下你自己：你做过什么、对什么有兴趣。当我们需要你的建议的时候，我们会联系你的（不会很经常）。"
-    more_about_counselor: "了解如何成为一名顾问"
     changes_auto_save: "在你勾选复选框后，更改将自动保存。"
     diligent_scribes: "我们勤奋的文书:"
     powerful_archmages: "我们强力的大法师:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     diplomat_title_description: "(翻译人员)"
     ambassador_title: "使节"
     ambassador_title_description: "(用户支持人员)"
-    counselor_title: "顾问"
-    counselor_title_description: "(专家/导师)"
 
   ladder:
     please_login: "请在对奕之前先登录."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
     choose_opponent: "选择一个对手"
+#    select_your_language: "Select your language!"
     tutorial_play: "玩教程"
     tutorial_recommended: "如果你从未玩过的话,推荐先玩下教程"
     tutorial_skip: "跳过教材"

app/locale/zh-HANT.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     error_saving: "保存時發生錯誤"
     saved: "修改已儲存"
     password_mismatch: "密碼不正確。"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/zh-WUU-HANS.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/locale/zh-WUU-HANT.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     error_saving: "保存時出錯"
     saved: "保存起來哉"
     password_mismatch: "密碼弗合。"
+#    password_repeat: "Please repeat your password."
     job_profile: "工作經歷"
     job_profile_approved: "爾填個工作經歷會讓CodeCombat來確認. 僱主會望着箇許訊息，除非爾畀渠調成望弗着狀態要勿粘牢四個星期朆改動。"
     job_profile_explanation: "爾好！填箇許訊息，我裏會用渠幫爾尋一份軟件開發個工作。"
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
     candidate_name: "名字"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     back: "倒退"
     revert: "還原"
     revert_models: "還原模式"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
     fork_title: "派生新版本"
     fork_creating: "徠搭執行派生..."
+#    randomize: "Randomize"
     more: "無數"
     wiki: "維基"
     live_chat: "上線白嗒"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
     more_about_ambassador: "瞭解怎兒當使節"
     ambassador_subscribe_desc: "用電子郵箱收 支持系統個情況，搭多人遊戲方面個新情況。"
-    counselor_summary: "上向許職業都弗中意？嘸較相干，我裏歡迎所有想參加 CodeCombat 開發個人！空是爾對教學、遊戲開發、開源管理方面許熟，要勿管哪許爾覺得搭我裏有相干個方面，箇勿箇職業適合爾。"
-    counselor_introduction_1: "嘸數爾有人生個經驗，也嘸數爾對 CodeCombat 個發展有自己特別個想法。徠所有箇許角色裏向，箇角色用個時間嘸數最少，不過以個人個角度爾個价值頂高。我裏徠搭尋各方面個能人，特別是教學、遊戲開發、開源軟件開發管理、技術企業招人、創業要勿設計方面個。"
-    counselor_introduction_2: "管解某，只講搭 CodeCombat 個開發搭界個都好用。空是爾有知識，咦想搭我裏搭搭，幫箇項目大起，箇職業適合爾。"
-    counselor_attribute_1: "經驗。上向所講個管哪個方面，要勿爾覺得對我裏有用場個方面。"
-    counselor_attribute_2: "一眼用來講講笑笑個時間！"
-    counselor_join_desc: "，搭我裏介紹記：爾做過解某、對何某有興趣。我裏需要爾個建議到會搭爾聯繫個（弗道道）。"
-    more_about_counselor: "瞭解怎兒當顧問"
     changes_auto_save: "多選框勾起之後，改動會自動存檔。"
     diligent_scribes: "我裏勤力個文書:"
     powerful_archmages: "我裏強力個大法師:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     diplomat_title_description: "(語言翻譯人)"
     ambassador_title: "使節"
     ambassador_title_description: "(用戶支持人)"
-    counselor_title: "顧問"
-    counselor_title_description: "(專家/內行人)"
 
   ladder:
     please_login: "對打前先登進來。"
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
     choose_opponent: "揀一個對手"
+#    select_your_language: "Select your language!"
     tutorial_play: "攪教程"
     tutorial_recommended: "假使爾從來朆攪過個話，建議爾先畀教程攪攪相"
     tutorial_skip: "跳過教程"

app/locale/zh.coffee

@@ -186,6 +186,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     error_saving: "保存失败"
     saved: "已保存"
     password_mismatch: "密码不对应"
+#    password_repeat: "Please repeat your password."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -326,7 +327,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
 #    what: "What is CodeCombat?"
-#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. We support JavaScript, Python, Lua, Clojure, CoffeeScript, and Io."
+#    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
 #    candidate_name: "Name"
@@ -499,8 +500,12 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    back: "Back"
 #    revert: "Revert"
 #    revert_models: "Revert Models"
+#    pick_a_terrain: "Pick A Terrain"
+#    small: "Small"
+#    grassy: "Grassy"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
+#    randomize: "Randomize"
 #    more: "More"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
@@ -740,13 +745,6 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
 #    more_about_ambassador: "Learn More About Becoming an Ambassador"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
 #    powerful_archmages: "Our Powerful Archmages:"
@@ -768,8 +766,6 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    diplomat_title_description: "(Translator)"
 #    ambassador_title: "Ambassador"
 #    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
@@ -801,6 +797,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    no_ranked_matches_pre: "No ranked matches for the "
 #    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
 #    choose_opponent: "Choose an Opponent"
+#    select_your_language: "Select your language!"
 #    tutorial_play: "Play Tutorial"
 #    tutorial_recommended: "Recommended if you've never played before"
 #    tutorial_skip: "Skip Tutorial"

app/models/User.coffee

@@ -46,6 +46,10 @@ module.exports = class User extends CocoModel
       )
     cache[id] = user
     user
+  set: ->
+    if arguments[0] is 'jobProfileApproved' and @get("jobProfileApproved") is false and not @get("jobProfileApprovedDate")
+      @set "jobProfileApprovedDate", (new Date()).toISOString()
+    super arguments...
 
   # callbacks can be either success or error
   @getByIDOrSlug: (idOrSlug, force, callbacks={}) ->
@@ -69,6 +73,13 @@ module.exports = class User extends CocoModel
     cache[idOrSlug] = user
     user
 
+  @getUnconflictedName: (name, done) ->
+    $.ajax "/auth/name/#{name}",
+      success: (data) -> done data.name
+      statusCode: 409: (data) ->
+        response = JSON.parse data.responseText
+        done response.name
+
   getEnabledEmails: ->
     @migrateEmails()
     emails = _.clone(@get('emails')) or {}

app/schemas/models/level_session.coffee

@@ -239,6 +239,9 @@ _.extend LevelSessionSchema.properties,
                     title: 'Opponent Rank'
                     description: 'The opponent\'s ranking in a given match'
                     type: 'number'
+              codeLanguage:
+                type: 'string'
+                description: 'What submittedCodeLanguage the opponent used during the match'
 
 c.extendBasicProperties LevelSessionSchema, 'level.session'
 c.extendPermissionsProperties LevelSessionSchema, 'level.session'

app/schemas/models/user.coffee

@@ -156,6 +156,7 @@ _.extend UserSchema.properties,
         type: 'boolean'
         description: 'Should this candidate be prominently featured on the site?'
   jobProfileApproved: {title: 'Job Profile Approved', type: 'boolean', description: 'Whether your profile has been approved by CodeCombat.'}
+  jobProfileApprovedDate: c.date {title: 'Approved date', description: 'The date that the candidate was approved'}
   jobProfileNotes: {type: 'string', maxLength: 1000, title: 'Our Notes', description: 'CodeCombat\'s notes on the candidate.', format: 'markdown', default: ''}
   employerAt: c.shortString {description: 'If given employer permissions to view job candidates, for which employer?'}
   signedEmployerAgreement: c.object {},

app/schemas/subscriptions/misc.coffee

@@ -9,6 +9,9 @@ module.exports =
   'note-group-ended':
     {} # TODO schema
 
+  'modal-opened':
+    {} # TODO schema
+
   'modal-closed':
     {} # TODO schema
 

app/schemas/subscriptions/play.coffee

@@ -32,9 +32,6 @@ module.exports =
   'level-set-grid':
     {} # TODO schema
 
-  'tome:cast-spell':
-    {} # TODO schema
-
   'level:restarted':
     {} # TODO schema
 

app/schemas/subscriptions/tome.coffee

@@ -1,74 +1,217 @@
 module.exports =
-  'tome:cast-spell':
-    {} # TODO schema
+  "tome:cast-spell":
+    title: "Cast Spell"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when a spell is cast"
+    type: ["object", "undefined"]
+    properties:
+      spell:
+        type: "object"
+      thang:
+        type: "object"
+      preload:
+        type: "boolean"
+    required: []
+    additionalProperties: false
 
   # TODO do we really need both 'cast-spell' and 'cast-spells'?
-  'tome:cast-spells':
-    {} # TODO schema
+  "tome:cast-spells":
+    title: "Cast Spells"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when spells are cast"
+    type: ["object", "undefined"]
+    properties:
+      spells:
+        type: "object"
+      preload:
+        type: "boolean"
+    required: []
+    additionalProperties: false
 
-  'tome:manual-cast':
-    {} # TODO schema
+  "tome:manual-cast":
+    title: "Manually Cast Spells"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you wish to manually recast all spells"
+    type: "object"
+    properties: {}
+    required: []
+    additionalProperties: false
 
-  'tome:spell-created':
-    {} # TODO schema
+  "tome:spell-created":
+    title: "Spell Created"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published after a new spell has been created"
+    type: "object"
+    properties:
+      "spell": "object"
+    required: ["spell"]
+    additionalProperties: false
 
-  'tome:spell-debug-property-hovered':
-    {} # TODO schema
+  "tome:spell-debug-property-hovered":
+    title: "Spell Debug Property Hovered"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you hover over a spell property"
+    type: "object"
+    properties:
+      "property": "string"
+      "owner": "string"
+    required: []
+    additionalProperties: false
 
-  'tome:toggle-spell-list':
-    {} # TODO schema
+  "tome:toggle-spell-list":
+    title: "Toggle Spell List"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you toggle the dropdown for a thang's spells"
+    type: "undefined"
+    additionalProperties: false
 
-  'tome:reload-code':
-    {} # TODO schema
+  "tome:reload-code":
+    title: "Reload Code"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you reset a spell to its original source"
+    type: "object"
+    properties:
+      "spell": "object"
+    required: ["spell"]
+    additionalProperties: false
 
-  'tome:palette-hovered':
-    {} # TODO schema
+  "tome:palette-hovered":
+    title: "Palette Hovered"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you hover over a Thang in the spell palette"
+    type: "object"
+    properties:
+      "thang": "object"
+      "prop": "string"
+      "entry": "object"
+    required: ["thang", "prop", "entry"]
+    additionalProperties: false
 
-  'tome:palette-pin-toggled':
-    {} # TODO schema
+  "tome:palette-pin-toggled":
+    title: "Palette Pin Toggled"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you pin or unpin the spell palette"
+    type: "object"
+    properties:
+      "entry": "object"
+      "pinned": "boolean"
+    required: ["entry", "pinned"]
+    additionalProperties: false
 
-  'tome:palette-clicked':
-    {} # TODO schema
+  "tome:palette-clicked":
+    title: "Palette Clicked"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you click on the spell palette"
+    type: "object"
+    properties:
+      "thang": "object"
+      "prop": "string"
+      "entry": "object"
+    required: ["thang", "prop", "entry"]
+    additionalProperties: false
 
-  'tome:spell-statement-index-updated':
-    {} # TODO schema
+  "tome:spell-statement-index-updated":
+    title: "Spell Statement Index Updated"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when the spell index is updated"
+    type: "object"
+    properties:
+      "statementIndex": "object"
+      "ace": "object"
+    required: ["statementIndex", "ace"]
+    additionalProperties: false
 
   # TODO proposition: refactor 'tome' into spell events
-  'spell-beautify':
-    {} # TODO schema
+  "spell-beautify":
+    title: "Beautify"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you click the \"beautify\" button"
+    type: "object"
+    properties:
+      "spell": "object"
+    required: []
+    additionalProperties: false
 
-  'spell-step-forward':
-    {} # TODO schema
+  "spell-step-forward":
+    title: "Step Forward"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you step forward in time"
+    type: "undefined"
+    additionalProperties: false
 
-  'spell-step-backward':
-    {} # TODO schema
+  "spell-step-backward":
+    title: "Step Backward"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you step backward in time"
+    type: "undefined"
+    additionalProperties: false
 
-  'tome:spell-loaded':
-    {} # TODO schema
+  "tome:spell-loaded":
+    title: "Spell Loaded"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when a spell is loaded"
+    type: "object"
+    properties:
+      "spell": "object"
+    required: ["spell"]
+    additionalProperties: false
 
-  'tome:cast-spell':
-    {} # TODO schema
+  "tome:spell-changed":
+    title: "Spell Changed"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when a spell is changed"
+    type: "object"
+    properties:
+      "spell": "object"
+    required: ["spell"]
+    additionalProperties: false
 
-  'tome:spell-changed':
-    {} # TODO schema
+  "tome:editing-began":
+    title: "Editing Began"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you have begun changing code"
+    type: "undefined"
+    additionalProperties: false
 
-  'tome:editing-ended':
-    {} # TODO schema
+  "tome:editing-ended":
+    title: "Editing Ended"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you have stopped changing code"
+    type: "undefined"
+    additionalProperties: false
 
-  'tome:editing-began':
-    {} # TODO schema
+  "tome:problems-updated":
+    title: "Problems Updated"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when problems have been updated"
+    type: "object"
+    properties:
+      "spell": "object"
+      "problems": "array"
+      "isCast": "boolean"
+    required: ["spell", "problems", "isCast"]
+    additionalProperties: false
 
-  'tome:problems-updated':
-    {} # TODO schema
+  "tome:thang-list-entry-popover-shown":
+    title: "Thang List Entry Popover Shown"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when we show the popover for a thang in the master list"
+    type: "object"
+    properties:
+      "entry": "object"
+    required: ["entry"]
+    additionalProperties: false
 
-  'tome:thang-list-entry-popover-shown':
-    {} # TODO schema
-
-  'tome:spell-shown':
-    {} # TODO schema
-
-  'tome:focus-editor':
-    {} # TODO schema
+  "tome:spell-shown":
+    title: "Spell Shown"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when we show a spell"
+    type: "object"
+    properties:
+      "thang": "object"
+      "spell": "object"
+    required: ["thang", "spell"]
+    additionalProperties: false
 
   'tome:change-language':
     title: 'Tome Change Language'
@@ -93,3 +236,37 @@ module.exports =
       language:
         type: 'string'
     required: ['spell']
+
+  "tome:comment-my-code":
+    title: "Comment My Code"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when we comment out a chunk of your code"
+    type: "undefined"
+    additionalProperties: false
+
+  "tome:change-config":
+    title: "Change Config"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when you change your tome settings"
+    type: "undefined"
+    additionalProperties: false
+
+  "tome:update-snippets":
+    title: "Update Snippets"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when we need to add Zatanna Snippets"
+    type: "object"
+    properties:
+      "propGroups": "object"
+      "allDocs": "object"
+      "language": "string"
+    required: ["propGroups", "allDocs"]
+    additionalProperties: false
+
+  # TODO proposition: add tome to name
+  "focus-editor":
+    title: "Focus Editor"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published whenever we want to give focus back to the editor"
+    type: "undefined"
+    additionalProperties: false

app/styles/bootstrap.scss

@@ -1 +0,0 @@
-@import "bootstrap/bootstrap";

app/styles/editor/level/modal/terrain_randomize.sass

@@ -1,4 +1,4 @@
-#terrain-randomise-modal
+#terrain-randomize-modal
 
   .choose-option
     margin-bottom: 15px

app/styles/modal/wizard_settings.sass

@@ -9,9 +9,9 @@
     display: block
     float: none
     background: white
-    
-  .wizard-name-line
+
+  #wizard-settings-name-wrapper
+    padding-left: 0px !important
+
+  .help-block
     text-align: center
-    margin-bottom: 10px
-    label
-      margin-right: 10px

app/styles/play/ladder/ladder_tab.sass

@@ -50,3 +50,9 @@
 
   td
     padding: 1px 2px
+
+  .code-language-cell
+    padding: 0 10px
+    background: transparent url(/images/pages/home/language_logo_javascript.png) no-repeat center center
+    background-size: contain
+    height: 19px

app/styles/play/ladder/my_matches_tab.sass

@@ -37,3 +37,9 @@
 
   td
     padding: 1px 2px
+
+  .code-language-cell
+    padding: 0 10px
+    background: transparent url(/images/pages/home/language_logo_javascript.png) no-repeat center center
+    background-size: contain
+    height: 19px

app/styles/play/ladder/play_modal.sass

@@ -95,7 +95,17 @@
     span
       position: relative
       top: 1px
-      
+
+    .code-language
+      position: absolute
+      background: transparent url(/images/pages/home/language_logo_javascript.png) no-repeat center center
+      background-size: contain
+      width: 40px
+      height: 40px
+      right: -5px
+      top: -15px
+      display: block
+
   .my-name
     border-right: 15px solid transparent
     left: 0
@@ -145,4 +155,4 @@
     top: 35px
     font-size: 40px
     font-weight: bolder
-    color: black
+    color: black

app/styles/play/level/tome/spell_list_entry.sass

@@ -13,13 +13,14 @@
   $childMargin: 2px
   $childSize: $height - 2 * $childMargin
   height: $height
-  width: 80%
-  width: -webkit-calc(100% - 100px)
-  width: calc(100% - 100px)
+  width: 90%
+  width: -webkit-calc(100% - 50px)
+  width: calc(100% - 50px)
   padding: 0px 8px
   border-width: 3px
   border-image: url(/images/level/code_editor_tab_background.png) 4 fill repeat
-  text-align: center
+  white-space: nowrap
+  position: relative
 
   &.read-only
     background: linear-gradient(to bottom, rgba(0,0,0,0.2) 0%,rgba(0,0,0,0.2) 100%), url(/images/level/code_editor_tab_background.png)
@@ -34,6 +35,11 @@
   .spell-list-button, .thang-avatar-wrapper
     float: left
 
+  .spell-tool-buttons
+    position: absolute
+    right: 0px
+    top: 0px
+
   .reload-code
     float: right
     display: none
@@ -66,6 +72,7 @@
 
   code
     margin-top: 7px
+    font-size: 1vw
 
 .spell-list-entry-view:not(.spell-tab)
   cursor: pointer
@@ -110,4 +117,4 @@ html.no-borderimage
     border-width: 0
     border-image: none
     background: transparent url(/images/level/code_editor_tab_background.png) no-repeat
-    background-size: 100% 100%
+    background-size: 100% 100%

app/styles/test.sass

@@ -1,5 +1,7 @@
 #test-view
+  background-color: #eee
   margin: 0 20px
+  padding: 0
   
   h2
     background: #add8e6
@@ -11,4 +13,4 @@
     width: 78%
     
   #test-nav
-    width: 20%
+    width: 20%

app/templates/account/settings.jade

@@ -9,7 +9,7 @@ block content
 
   else
     #save-button-container
-      button.btn#save-button.disabled.secret(data-i18n="account_settings.autosave") Changes Save Automatically
+      button.btn#save-button.disabled(data-i18n="general.save" disabled="true") No Changes
   
     ul.nav.nav-pills#settings-tabs
       li
@@ -30,16 +30,19 @@ block content
       #general-pane.tab-pane
         p
           .form
+            - var name = me.get('name') || '';
+            - var email = me.get('email');
+            - var admin = me.get('permissions').indexOf('admin') != -1;
             .form-group
               label.control-label(for="name", data-i18n="general.name") Name
-              input#name.form-control(name="name", type="text", value="#{me.get('name') || ''}")
+              input#name.form-control(name="name", type="text", value="#{name}")
             .form-group
               label.control-label(for="email", data-i18n="general.email") Email
-              input#email.form-control(name="email", type="text", value="#{me.get('email')}")
+              input#email.form-control(name="email", type="text", value="#{email}")
             if !isProduction
               .form-group.checkbox
                 label(for="admin", data-i18n="account_settings.admin") Admin
-                input#admin(name="admin", type="checkbox", checked=me.get('permissions').indexOf('admin') != -1)
+                input#admin(name="admin", type="checkbox", checked=admin)
               
   
       #picture-pane.tab-pane

app/templates/community.jade

@@ -1,7 +1,7 @@
 extends /templates/base
 
 block content
-  
+
   h1(data-i18n="community.main_title") CodeCombat Community
 
   p There are dozens of ways you can get involved with CodeCombat. Check out the resources we've built, decide what sounds the most fun, and we look forward to working with you!
@@ -15,13 +15,13 @@ block content
       p We have built several tools that enable users to get not only edit, but also build new game content!
 
         ul
-          li 
+          li
             a(href="/editor/level", data-i18n="community.level_editor")
             | : fork, edit, or build your own CodeCombat levels. New levels can be kept private or published to the community.
-          li 
+          li
             a(href="/editor/thang", data-i18n="editor.thang_title")
             | : modify or import new art assets for the game using our powerful editor.
-          li 
+          li
             a(href="/editor/article", data-i18n="editor.article_title")
             | : edit or create documentation used in CodeCombat levels.
 
@@ -35,51 +35,51 @@ block content
 
         ul
 
-          li We write about our progress and current projects on our 
-            a(href="http://blog.codecombat.com", data-i18n="nav.blog")
+          li We write about our progress and current projects on our
+            a.spl(href="http://blog.codecombat.com", data-i18n="nav.blog")
             | .
-          li Participate in our active user community by checking out our 
-            a(href="http://discourse.codecombat.com", data-i18n="nav.forum") 
+          li Participate in our active user community by checking out our
+            a.spl(href="http://discourse.codecombat.com", data-i18n="nav.forum")
             | .
-          li For regular news about learning to code, games, and education, check out our 
-            a(href="https://www.facebook.com/codecombat", data-i18n="community.facebook") 
+          li For regular news about learning to code, games, and education, check out our
+            a.spl(href="https://www.facebook.com/codecombat", data-i18n="community.facebook")
             | .
-          li For realtime status or to have a quick chat, follow us on 
-            a(href="https://twitter.com/CodeCombat", data-i18n="community.twitter") 
+          li For realtime status or to have a quick chat, follow us on
+            a.spl(href="https://twitter.com/CodeCombat", data-i18n="community.twitter")
             | .
-          li Don't like Facebook? We're on 
-            a(href="https://plus.google.com/115285980638641924488/posts", data-i18n="community.gplus") 
+          li Don't like Facebook? We're on
+            a.spl(href="https://plus.google.com/115285980638641924488/posts", data-i18n="community.gplus")
             | .
-          li You can also find us in our 
-            a(href="http://www.hipchat.com/g3plnOKqa", data-i18n="editor.hipchat_url")
+          li You can also find us in our
+            a.spl(href="http://www.hipchat.com/g3plnOKqa", data-i18n="editor.hipchat_url")
 
     .community_columns
 
       h2 Contribute
 
-      p Put your skills to use helping us teach the world to code. We have a lot of roles you can consider, and if we don't have a role for you, let us know: 
+      p Put your skills to use helping us teach the world to code. We have a lot of roles you can consider, and if we don't have a role for you, let us know:
 
         ul
 
-          li 
-            a(href="/contribute#archmage", data-i18n="classes.archmage_title") 
+          li
+            a(href="/contribute#archmage", data-i18n="classes.archmage_title")
             | : contribute by writing code.
-          li 
-            a(href="/contribute#artisan", data-i18n="classes.artisan_title") 
+          li
+            a(href="/contribute#artisan", data-i18n="classes.artisan_title")
             | : build new game levels.
-          li 
-            a(href="/contribute#adventurer", data-i18n="classes.adventurer_title") 
+          li
+            a(href="/contribute#adventurer", data-i18n="classes.adventurer_title")
             | : test new game levels.
-          li 
-            a(href="/contribute#scribe", data-i18n="classes.scribe_title") 
+          li
+            a(href="/contribute#scribe", data-i18n="classes.scribe_title")
             | : write educational documentation.
-          li 
-            a(href="/contribute#diplomat", data-i18n="classes.diplomat_title") 
+          li
+            a(href="/contribute#diplomat", data-i18n="classes.diplomat_title")
             | : translate site content.
-          li 
-            a(href="/contribute#ambassador", data-i18n="classes.ambassador_title") 
+          li
+            a(href="/contribute#ambassador", data-i18n="classes.ambassador_title")
             | : support our community of educators and coders.
 
-        | Check out the 
-        a(href="/contribute", data-i18n="nav.contribute") 
+        | Check out the
+        a.spl(href="/contribute", data-i18n="nav.contribute")
         |  page to find out more about the roles and how you can get started.

app/templates/editor/level/component/edit.jade

@@ -28,9 +28,10 @@ nav.navbar.navbar-default(role='navigation')
               span.glyphicon.glyphicon-eye-close
               span.spl Unwatch
   
-        li#patch-component-button
-          a(data-i18n="common.submit_patch") Submit Patch
-        if me.isAdmin()
+        if !component.hasWriteAccess()
+          li#patch-component-button
+            a(data-i18n="common.submit_patch") Submit Patch
+        if !me.get('anonymous')
           li#create-new-component-button
             a(data-i18n="editor.level_component_b_new") Create New Component
         

app/templates/editor/level/edit.jade

@@ -49,7 +49,7 @@ block header
         
         if level.get('type') === 'ladder'
           li.dropdown
-            a(data-toggle='dropdown')
+            a(data-toggle='dropdown').play-with-team-parent
               span.glyphicon-play.glyphicon
             ul.dropdown-menu
               li.dropdown-header Play As Which Team?
@@ -80,7 +80,7 @@ block header
             li(class=anonymous ? "disabled": "")
               a(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert")#revert-button Revert
             li(class=anonymous ? "disabled": "")
-              a(data-toggle="coco-modal", data-target="modal/terrain_randomise", data-i18n="editor.randomize")#randomise-button Randomise
+              a(data-toggle="coco-modal", data-target="editor/level/modal/terrain_randomize", data-i18n="editor.randomize")#randomize-button Randomize
             li(class=anonymous ? "disabled": "")
               a(data-i18n="editor.pop_i18n")#pop-level-i18n-button Populate i18n
             li.divider

app/templates/editor/level/modal/terrain_randomize.jade

@@ -8,8 +8,8 @@ block modal-body-content
     a(href="#")
         div.choose-option(data-preset-type="grassy", data-preset-size="small")
           div.preset-size.name-label
-            span(data-i18n="ladder.small") Small
+            span(data-i18n="editor.small") Small
           div.preset-name
-            span(data-i18n="ladder.grassy") Grassy
+            span(data-i18n="editor.grassy") Grassy
     //- for model in models
 block modal-footer

app/templates/modal/auth.jade

@@ -34,6 +34,12 @@ block modal-body-content
         input#password.input-large.form-control(name="password", type="password", value=formValues.password)
 
     if mode === 'signup'
+      .form-group
+        label.control-label(for="name", data-i18n="general.name") Name
+        if me.get('name')
+          input#name.input-large.form-control(name="name", type="text", value="#{me.get('name')}")
+        else
+          input#name.input-large.form-control(name="name", type="text", value="", placeholder="Anoner")
       .form-group.checkbox
         label.control-label(for="subscribe")
           input#subscribe(name="subscribe", type="checkbox", checked='checked')

app/templates/modal/recover.jade

@@ -4,7 +4,7 @@ block modal-header-content
   h3(data-i18n="recover.recover_account_title") Recover Account
 
 block modal-body-content
-  .form-inline
+  .form
     .form-group
       label.control-label(for="recover-email", data-i18n="general.email") Email     
       input#recover-email.input-large.form-control(name="email", type="email")

app/templates/modal/wizard_settings.jade

@@ -4,10 +4,13 @@ block modal-header-content
   h3(data-i18n="wizard_settings.title2") Customize Your Character
 
 block modal-body-content
-  div.wizard-name-line.form-group
-    label.control-label(for="name")
-      | Your Wizardly Name:
-    input#wizard-settings-name(name="name", type="text", value="#{me.get('name')||''}")
+  form.form-horizontal
+    div.form-group
+      .row
+        label.control-label.col-sm-6(for="name")
+          | Your Wizardly Name:
+        #wizard-settings-name-wrapper.col-sm-4
+          input#wizard-settings-name.form-control.input-sm(name="name", type="text", value="#{me.get('name')||''}")
 
   #wizard-settings-view
 

app/templates/play/ladder/ladder_tab.jade

@@ -4,13 +4,13 @@ div#columns.row
       div(id="histogram-display-#{team.name}", class="histogram-display",data-team-name=team.name)
       table.table.table-bordered.table-condensed.table-hover
         tr
-          th
+          th(colspan=2)
           th(colspan=3, style="color: #{team.primaryColor}")
             span= team.name
             span  
             span(data-i18n="ladder.leaderboard") Leaderboard
         tr
-          th
+          th(colspan=2)
           th(data-i18n="general.score") Score
           th(data-i18n="general.name").name-col-cell Name
           th
@@ -21,6 +21,7 @@ div#columns.row
         for session, rank in topSessions
           - var myRow = session.get('creator') == me.id
           tr(class=myRow ? "success" : "", data-player-id=session.get('creator'), data-session-id=session.id)
+            td.code-language-cell(style="background-image: url(/images/pages/home/language_logo_" + session.get('submittedCodeLanguage') + ".png)")
             td.rank-cell= rank + 1
             td.score-cell= Math.round(session.get('totalScore') * 100)
             td.name-col-cell= session.get('creatorName') || "Anonymous"
@@ -34,6 +35,7 @@ div#columns.row
           for session in team.leaderboard.nearbySessions()
             - var myRow = session.get('creator') == me.id
             tr(class=myRow ? "success" : "", data-player-id=session.get('creator'), data-session-id=session.id)
+              td.code-language-cell(style="background-image: url(/images/pages/home/language_logo_" + session.get('submittedCodeLanguage') + ".png)")
               td.rank-cell= session.rank
               td.score-cell= Math.round(session.get('totalScore') * 100)
               td.name-col-cell= session.get('creatorName') || "Anonymous"

app/templates/play/ladder/my_matches_tab.jade

@@ -4,7 +4,7 @@ div#columns.row
       table.table.table-bordered.table-condensed
 
         tr
-          th(colspan=4, style="color: #{team.primaryColor}")
+          th(colspan=5, style="color: #{team.primaryColor}")
             span(data-i18n="ladder.summary_your") Your 
             |#{team.name}
             |  
@@ -16,16 +16,17 @@ div#columns.row
 
         if team.session
           tr
-            th(colspan=4)
+            th(colspan=5)
               .ladder-submission-view(data-session-id=team.session.id)
 
         if team.scoreHistory
           tr
-            th(colspan=4, style="color: #{team.primaryColor}")
+            th(colspan=5, style="color: #{team.primaryColor}")
               div(class="score-chart-wrapper", data-team-name=team.name, id="score-chart-#{team.name}")
 
         tr
           th(data-i18n="general.result") Result
+          th
           th(data-i18n="general.opponent") Opponent
           th(data-i18n="general.when") When
           th
@@ -38,6 +39,7 @@ div#columns.row
                 span(data-i18n="general.loss").loss Loss
               if match.state === 'tie'
                 span(data-i18n="general.tie").tie Tie
+            td.code-language-cell(style="background-image: url(/images/pages/home/language_logo_" + match.codeLanguage +  ".png)")
             td.name-cell= match.opponentName || "Anonymous"
             td.time-cell= match.when
             td.battle-cell

app/templates/play/ladder/play_modal.jade

@@ -13,13 +13,16 @@ block modal-body-content
     span.btn.btn-primary.btn-block.btn-lg#skip-tutorial-button(data-i18n="ladder.tutorial_skip") Skip Tutorial
 
   div#normal-view
-  
     if tutorialLevelExists
       p.tutorial-suggestion
         strong(data-i18n="ladder.tutorial_not_sure") Not sure what's going on?
         |  
         a(href="/play/level/#{levelID}-tutorial", data-i18n="ladder.tutorial_play_first") Play the tutorial first.
-  
+    h4.language-selection(data-i18n="ladder.select_your_language") Select your language!
+    .form-group.select-group
+      select#tome-language(name="language")
+        for option in languages
+          option(value=option.id selected=(language === option.id))= option.name
     a(href="/play/level/#{levelID}?team=#{teamID}")
       div.play-option
         img(src=myPortrait).my-icon.only-one
@@ -30,6 +33,7 @@ block modal-body-content
           span= myName
         div.opponent-name.name-label
           span(data-i18n="ladder.simple_ai") Simple AI
+          //span.code-language(style="background-image: url(/images/pages/home/language_logo_javascript.png)")
         div.difficulty
           span(data-i18n="ladder.warmup") Warmup
         div(data-i18n="ladder.vs").vs VS
@@ -45,6 +49,8 @@ block modal-body-content
             span= myName
           div.opponent-name.name-label
             span= challengers.easy.opponentName
+            if challengers.easy.codeLanguage
+              span.code-language(style="background-image: url(/images/pages/home/language_logo_" + challengers.easy.codeLanguage + ".png)")
           div.difficulty
             span(data-i18n="general.easy") Easy
           div(data-i18n="ladder.vs").vs VS
@@ -60,6 +66,8 @@ block modal-body-content
             span= myName
           div.opponent-name.name-label
             span= challengers.medium.opponentName
+            if challengers.medium.codeLanguage
+              span.code-language(style="background-image: url(/images/pages/home/language_logo_" + challengers.medium.codeLanguage + ".png)")
           div.difficulty
             span(data-i18n="general.medium") Medium
           div(data-i18n="ladder.vs").vs VS
@@ -75,6 +83,8 @@ block modal-body-content
             span= myName
           div.opponent-name.name-label
             span= challengers.hard.opponentName
+            if challengers.hard.codeLanguage
+              span.code-language(style="background-image: url(/images/pages/home/language_logo_" + challengers.hard.codeLanguage + ".png)")
           div.difficulty
             span(data-i18n="general.hard") Hard
           div(data-i18n="ladder.vs").vs VS

app/templates/play/level/tome/spell_list_tab_entry.jade

@@ -4,15 +4,15 @@
 
 code #{methodSignature}
 
-.btn.btn-small.fullscreen-code(title="Expand code editor")
-  i.icon-fullscreen
-  i.icon-resize-small
-    
-.btn.btn-small.reload-code(title="Reload original code for " + spell.name)
-  i.icon-repeat
+.spell-tool-buttons
+  .btn.btn-small.fullscreen-code(title="Expand code editor")
+    i.icon-fullscreen
+    i.icon-resize-small
+      
+  .btn.btn-small.reload-code(title="Reload original code for " + spell.name)
+    i.icon-repeat
+  
+  .btn.btn-small.beautify-code(title="Ctrl+Shift+B: Beautify code for " + spell.name)
+    i.icon-magnet
 
-.btn.btn-small.beautify-code(title="Ctrl+Shift+B: Beautify code for " + spell.name)
-  i.icon-magnet
-
-
-.clearfix
+  .clearfix