Merge remote-tracking branch 'upstream/master'

2025-03-31 07:12:49 -04:00 · 2014-06-28 12:53:20 +02:00 · 2014-06-28 12:53:20 +02:00 · 568e334f13
commit 568e334f13
parent 6ea2f1c76d 66da53f8f9
140 changed files with 1735 additions and 973 deletions
--- a/.gitignore
+++ b/.gitignore
@ -44,6 +44,7 @@ always-ignore extensions
 *.rej
 *.vi
 *.sass-cache
+.zedstate

 # OS or Editor folders
 .cache
@ -86,4 +87,6 @@ login.coffee
 # debugging
 *.heapsnapshot

+temp/
 ### If you add something here, copy it to the end of .npmignore, too. ###
+
--- a/.npmignore
+++ b/.npmignore
@ -68,6 +68,7 @@ always-ignore extensions
 *.rej
 *.vi
 *.sass-cache
+.zedstate

 # OS or Editor folders
 .cache
@ -95,6 +96,8 @@ bin/mongo/
 # Karma coverage
 coverage/

+temp/
+
 # local settings
 login.coffee

--- a/.zedstate
+++ b/.zedstate
@ -1 +0,0 @@
-{"split":"preview-2","session.current":["/app/styles/play/level/tome/spell.sass"],"session.open":{"/app/styles/play/level/tome/spell.sass":{"scrollTop":0,"scrollLeft":0,"selection":{"start":{"row":0,"column":0},"end":{"row":0,"column":0}},"lastUse":1402419134780,"undo":[],"redo":[]}},"window":{"width":1680,"height":1024,"top":22,"left":0}}
--- a/app/assets/images/pages/employer/employer_icon5.png
+++ b/app/assets/images/pages/employer/employer_icon5.png
--- a/app/assets/images/pages/employer/employer_icon6.png
+++ b/app/assets/images/pages/employer/employer_icon6.png
--- a/app/assets/images/pages/home/language_background_small.png
+++ b/app/assets/images/pages/home/language_background_small.png
--- a/app/assets/images/pages/home/language_beta_sticker.png
+++ b/app/assets/images/pages/home/language_beta_sticker.png
--- a/app/assets/images/pages/home/language_js.png
+++ b/app/assets/images/pages/home/language_js.png
--- a/app/assets/images/pages/home/language_logo_clojure.png
+++ b/app/assets/images/pages/home/language_logo_clojure.png
--- a/app/assets/images/pages/home/language_logo_coffeescript.png
+++ b/app/assets/images/pages/home/language_logo_coffeescript.png
--- a/app/assets/images/pages/home/language_logo_io.png
+++ b/app/assets/images/pages/home/language_logo_io.png
--- a/app/assets/images/pages/home/language_logo_javascript.png
+++ b/app/assets/images/pages/home/language_logo_javascript.png
--- a/app/assets/images/pages/home/language_logo_lua.png
+++ b/app/assets/images/pages/home/language_logo_lua.png
--- a/app/assets/images/pages/home/language_logo_python.png
+++ b/app/assets/images/pages/home/language_logo_python.png
--- a/app/assets/images/pages/home/language_python.png
+++ b/app/assets/images/pages/home/language_python.png
--- a/app/assets/images/pages/home/wizard.png
+++ b/app/assets/images/pages/home/wizard.png
--- a/app/assets/javascripts/workers/worker_world.js
+++ b/app/assets/javascripts/workers/worker_world.js
@ -51,7 +51,12 @@ var console = {
        self.postMessage({type: 'console-log', args: args, id: self.workerID});
      }
      catch(error) {
-        self.postMessage({type: 'console-log', args: ["Could not post log: " + args, error.toString(), error.stack, error.stackTrace], id: self.workerID});
+        try {
+          self.postMessage({type: 'console-log', args: ["Could not post log: " + args, error.toString(), error.stack, error.stackTrace], id: self.workerID});
+        }
+        catch(error2) {
+          self.postMessage({type: 'console-log', args: ["Wow, we had a serious problem trying to console.log something."]});
+        }
      }
    }
  }};  // so that we don't crash when debugging statements happen
--- a/app/assets/main.html
+++ b/app/assets/main.html
@ -37,6 +37,19 @@
  <script src="/javascripts/aether.js"></script>
  <script src="/javascripts/app.js"></script> <!-- it's all Backbone! -->
  
+  <script>
+    window.linkedInAsyncInit = function() {
+      console.log("Linkedin Async Init!");
+      Backbone.Mediator.publish('linkedin-loaded');
+    };
+    
+  </script>
+  <script type="text/javascript" async src="http://platform.linkedin.com/in.js">
+    api_key: 75v8mv4ictvmx6
+    onLoad: linkedInAsyncInit
+    authorize: true
+  </script>
+  
  <script>
    window.userObject = "userObjectTag";
  </script>
--- a/app/lib/Angel.coffee
+++ b/app/lib/Angel.coffee
@ -8,8 +8,8 @@ CocoClass = require 'lib/CocoClass'
 module.exports = class Angel extends CocoClass
  @nicks: ['Archer', 'Lana', 'Cyril', 'Pam', 'Cheryl', 'Woodhouse', 'Ray', 'Krieger']

-  infiniteLoopIntervalDuration: 7500  # check this often
-  infiniteLoopTimeoutDuration: 5000  # wait this long for a response when checking
+  infiniteLoopIntervalDuration: 10000  # check this often; must be longer than other two combined
+  infiniteLoopTimeoutDuration: 7500  # wait this long for a response when checking
  abortTimeoutDuration: 500  # give in-process or dying workers this long to give up

  constructor: (@shared) ->
@ -58,6 +58,7 @@ module.exports = class Angel extends CocoClass
      when 'start-load-frames'
        clearTimeout @condemnTimeout
      when 'report-in'
+        @say "Worker reported in."
        clearTimeout @condemnTimeout
      when 'end-load-frames'
        clearTimeout @condemnTimeout
--- a/app/lib/God.coffee
+++ b/app/lib/God.coffee
@ -124,6 +124,8 @@ module.exports = class God extends CocoClass
        console.log "|#{@nick}'s debugger|", event.data.args...
      when 'debug-value-return'
        Backbone.Mediator.publish 'god:debug-value-return', event.data.serialized
+      when 'debug-world-load-progress-changed'
+        Backbone.Mediator.publish 'god:debug-world-load-progress-changed', event.data

  onNewWorldCreated: (e) ->
    @currentUserCodeMap = @filterUserCodeMapWhenFromWorld e.world.userCodeMap
--- a/app/lib/NameLoader.coffee
+++ b/app/lib/NameLoader.coffee
@ -4,7 +4,7 @@ namesCache = {}

 class NameLoader extends CocoClass
  loadNames: (ids) ->
-    toLoad = (id for id in ids when not namesCache[id])
+    toLoad = _.uniq (id for id in ids when not namesCache[id])
    return false unless toLoad.length
    jqxhrOptions = {
      url: '/db/user/x/names', 
@ -18,6 +18,6 @@ class NameLoader extends CocoClass
  loadedNames: (newNames) =>
    _.extend namesCache, newNames
    
-  getName: (id) -> namesCache[id].name
+  getName: (id) -> namesCache[id]?.name or id

 module.exports = new NameLoader()
--- a/app/lib/services/google.coffee
+++ b/app/lib/services/google.coffee
@ -1,8 +1,8 @@
 module.exports = initializeGoogle = ->
-  onGPlusLoaded = ->
+  window.onGPlusLoaded = ->
    Backbone.Mediator.publish "gapi-loaded"
    return
-  signinCallback = (authResult) ->
+  window.signinCallback = (authResult) ->
    Backbone.Mediator.publish "gplus-logged-in", authResult  if authResult["access_token"]
    return
  (->
--- a/app/lib/services/linkedin.coffee
+++ b/app/lib/services/linkedin.coffee
@ -1,12 +1,9 @@
 module.exports = initializeLinkedIn = ->
  window.linkedInAsyncInit = ->
+    console.log "Linkedin async init success!"
    Backbone.Mediator.publish 'linkedin-loaded'

  linkedInSnippet =
-    '<script type="text/javascript" async src="http://platform.linkedin.com/in.js">
-      api_key: 75v8mv4ictvmx6
-      onLoad: linkedInAsyncInit
-      authorize: true
-    </script>'
+    ''

  $('head').append(linkedInSnippet)
--- a/app/lib/simulator/Simulator.coffee
+++ b/app/lib/simulator/Simulator.coffee
@ -37,6 +37,10 @@ module.exports = class Simulator extends CocoClass
        console.warn "There was an error fetching two games! #{JSON.stringify errorData}"
      success: (taskData) =>
        return if @destroyed
+        unless taskData
+          @trigger 'statusUpdate', "No games to simulate. Trying another game in #{@retryDelayInSeconds} seconds."
+          @simulateAnotherTaskAfterDelay()
+          return
        @trigger 'statusUpdate', 'Setting up simulation...'
        #refactor this
        @task = new SimulationTask(taskData)
@ -141,7 +145,7 @@ module.exports = class Simulator extends CocoClass
    console.log info
    @trigger 'statusUpdate', info
    @fetchAndSimulateOneGame()
-    application.tracker?.trackEvent 'Simulator Result', label: "No Games"
+    application.tracker?.trackEvent 'Simulator Result', label: "No Games", ['Google Analytics']

  simulateAnotherTaskAfterDelay: =>
    console.log "Retrying in #{@retryDelayInSeconds}"
@ -180,7 +184,7 @@ module.exports = class Simulator extends CocoClass
    try
      @commenceSimulationAndSetupCallback()
    catch err
-      console.log "There was an error in simulation(#{err}). Trying again in #{@retryDelayInSeconds} seconds"
+      console.error "There was an error in simulation:", err, "-- trying again in #{@retryDelayInSeconds} seconds"
      @simulateAnotherTaskAfterDelay()

  assignWorldAndLevelFromLevelLoaderAndDestroyIt: ->
@ -264,7 +268,7 @@ module.exports = class Simulator extends CocoClass
    unless @options.headlessClient
      simulatedBy = parseInt($('#simulated-by-you').text(), 10) + 1
      $('#simulated-by-you').text(simulatedBy)
-    application.tracker?.trackEvent 'Simulator Result', label: "Success"
+    application.tracker?.trackEvent 'Simulator Result', label: "Success", ['Google Analytics']

  handleTaskResultsTransferError: (error) =>
    return if @destroyed
@ -367,8 +371,13 @@ module.exports = class Simulator extends CocoClass
    spellTeam = @task.getSpellKeyToTeamMap()[spellKey]
    playerTeams = @task.getPlayerTeams()
    useProtectAPI = true
-    if spellTeam not in playerTeams then useProtectAPI = false
-    @spells[spellKey].thangs[thang.id].aether = @createAether @spells[spellKey].name, method, useProtectAPI
+    if spellTeam not in playerTeams
+      useProtectAPI = false
+    else
+      spellSession = _.filter(@task.getSessions(), {team: spellTeam})[0]
+      unless codeLanguage = spellSession?.submittedCodeLanguage
+        console.warn "Session", spellSession.creatorName, spellSession.team, "didn't have submittedCodeLanguage, just:", spellSession
+    @spells[spellKey].thangs[thang.id].aether = @createAether @spells[spellKey].name, method, useProtectAPI, codeLanguage ? 'javascript'


  transpileSpell: (thang, spellKey, methodName) ->
@ -385,7 +394,7 @@ module.exports = class Simulator extends CocoClass
        console.log "Couldn't transpile #{spellKey}:\n#{source}\n", e
        aether.transpile ''

-  createAether: (methodName, method, useProtectAPI) ->
+  createAether: (methodName, method, useProtectAPI, codeLanguage) ->
    aetherOptions =
      functionName: methodName
      protectAPI: useProtectAPI
@ -398,8 +407,10 @@ module.exports = class Simulator extends CocoClass
        aether_MissingThis: {level: 'error'}
      #functionParameters: # TODOOOOO
      executionLimit: 1 * 1000 * 1000
-    if methodName is 'hear'
-      aetherOptions.functionParameters = ['speaker', 'message', 'data']
+      language: codeLanguage
+    if methodName is 'hear' then aetherOptions.functionParameters = ['speaker', 'message', 'data']
+    if methodName is 'makeBid' then aetherOptions.functionParameters = ['tileGroupLetter']
+    if methodName is "findCentroids" then aetherOptions.functionParameters = ["centroids"]
    #console.log "creating aether with options", aetherOptions
    return new Aether aetherOptions

@ -468,7 +479,6 @@ class SimulationTask

  getWorldProgrammableSource: (desiredSpellKey ,world) ->
    programmableThangs = _.filter world.thangs, 'isProgrammable'
-    language = @getSessions()[0]['codeLanguage'] ? me.get('aceConfig')?.language ? 'javascript'
    @spells ?= {}
    @thangSpells ?= {}
    for thang in programmableThangs
--- a/app/lib/surface/Camera.coffee
+++ b/app/lib/surface/Camera.coffee
@ -288,10 +288,13 @@ module.exports = class Camera extends CocoClass
  boundTarget: (pos, zoom) ->
    # Given an {x, y} in Surface coordinates, return one that will keep our viewport on the Surface.
    return pos unless @bounds
+    y = pos.y
+    if thang = pos.sprite?.thang
+      y = @worldToSurface(x: thang.pos.x, y: thang.pos.y).y  # ignore z
    marginX = (@canvasWidth / zoom / 2)
    marginY = (@canvasHeight / zoom / 2)
    x = Math.min(Math.max(marginX + @bounds.x, pos.x + @offset.x), @bounds.x + @bounds.width - marginX)
-    y = Math.min(Math.max(marginY + @bounds.y, pos.y + @offset.y), @bounds.y + @bounds.height - marginY)
+    y = Math.min(Math.max(marginY + @bounds.y, y + @offset.y), @bounds.y + @bounds.height - marginY)
    {x: x, y: y}

  updateViewports: (target) ->
--- a/app/lib/surface/CocoSprite.coffee
+++ b/app/lib/surface/CocoSprite.coffee
@ -364,9 +364,12 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
  updateAlpha: ->
    @imageObject.alpha = if @hiding then 0 else 1
    return unless @thang?.alpha?
+    return if @imageObject.alpha is @thang.alpha
    @imageObject.alpha = @thang.alpha
    if @options.showInvisible
      @imageObject.alpha = Math.max 0.5, @imageObject.alpha
+    mark.updateAlpha @thang.alpha for name, mark of @marks
+    @healthBar?.alpha = @thang.alpha

  updateRotation: (imageObject) ->
    rotationType = @thangType.get('rotationType')
--- a/app/lib/surface/Mark.coffee
+++ b/app/lib/surface/Mark.coffee
@ -5,6 +5,7 @@ markThangTypes = {}

 module.exports = class Mark extends CocoClass
  subscriptions: {}
+  alpha: 1

  constructor: (options) ->
    super()
@ -66,28 +67,40 @@ module.exports = class Mark extends CocoClass
    @mark.mouseChildren = false

    # Confusingly make some semi-random colors that'll be consistent based on the drawsBoundsIndex
-    index = @sprite.thang.drawsBoundsIndex
-    colors = (128 + Math.floor(('0.'+Math.sin(3 * index + i).toString().substr(6)) * 128) for i in [1 ... 4])
+    @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)"
-
-    shape = new createjs.Shape()
-    shape.graphics.setStrokeStyle 5
-    shape.graphics.beginStroke color
-    shape.graphics.beginFill color.replace('0.5', '0.25')
    [w, h] = [@sprite.thang.width * Camera.PPM, @sprite.thang.height * Camera.PPM * @camera.y2x]
-    if @sprite.thang.shape in ["ellipsoid", "disc"]
-      shape.drawEllipse 0, 0, w, h
+
+    if @sprite.thang.drawsBoundsStyle is 'border-text'
+      shape = new createjs.Shape()
+      shape.graphics.setStrokeStyle 5
+      shape.graphics.beginStroke color
+      shape.graphics.beginFill color.replace('0.5', '0.25')
+      if @sprite.thang.shape in ["ellipsoid", "disc"]
+        shape.drawEllipse 0, 0, w, h
+      else
+        shape.graphics.drawRect -w / 2, -h / 2, w, h
+      shape.graphics.endStroke()
+      shape.graphics.endFill()
+      @mark.addChild shape
+
+    if @sprite.thang.drawsBoundsStyle is 'border-text'
+      text = new createjs.Text "" + @drawsBoundsIndex, "20px Arial", color.replace('0.5', '1')
+      text.regX = text.getMeasuredWidth() / 2
+      text.regY = text.getMeasuredHeight() / 2
+      text.shadow = new createjs.Shadow("#000000", 1, 1, 0)
+      @mark.addChild text
+    else if @sprite.thang.drawsBoundsStyle is 'corner-text'
+      return if @sprite.thang.world.age is 0
+      letter = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[@drawsBoundsIndex % 26]
+      text = new createjs.Text letter, "14px Arial", "#333333"   # color.replace('0.5', '1')
+      text.x = -w / 2 + 2
+      text.y = -h / 2 + 2
+      @mark.addChild text
    else
-      shape.graphics.drawRect -w / 2, -h / 2, w, h
-    shape.graphics.endStroke()
-    shape.graphics.endFill()
+      console.warn @sprite.thang.id, "didn't know how to draw bounds style:", @sprite.thang.drawsBoundsStyle

-    text = new createjs.Text "" + index, "20px Arial", color.replace('0.5', '1')
-    text.regX = text.getMeasuredWidth() / 2
-    text.regY = text.getMeasuredHeight() / 2
-    text.shadow = new createjs.Shadow("#000000", 1, 1, 0)
-
-    @mark.addChild shape, text
    if w > 0 and h > 0
      @mark.cache -w / 2, -h / 2, w, h, 2
    @lastWidth = @sprite.thang.width
@ -216,11 +229,10 @@ module.exports = class Mark extends CocoClass
    true

  updatePosition: (pos) ->
-    if @name in ['shadow', 'debug']
+    if @sprite?.thang and @name in ['shadow', 'debug', 'target', 'selection', 'repair']
      pos = @camera.worldToSurface x: @sprite.thang.pos.x, y: @sprite.thang.pos.y
      if @name is 'shadow'
-        worldZ = @sprite.thang.pos.z - @sprite.thang.depth / 2 + @sprite.getBobOffset()
-        @mark.alpha = 0.451 / Math.sqrt(worldZ / 2 + 1)
+        @updateAlpha @alpha
    else
      pos ?= @sprite?.imageObject
    @mark.x = pos.x
@ -231,23 +243,36 @@ module.exports = class Mark extends CocoClass
      @mark.y += offset.y
      @mark.y -= 3 if @statusEffect

+  updateAlpha: (@alpha) ->
+    return if not @mark or @name is 'debug'
+    if @name is 'shadow'
+      worldZ = @sprite.thang.pos.z - @sprite.thang.depth / 2 + @sprite.getBobOffset()
+      @mark.alpha = @alpha * 0.451 / Math.sqrt(worldZ / 2 + 1)
+    else if @name isnt "bounds"
+      @mark.alpha = @alpha
+
  updateRotation: ->
    if @name is 'debug' or (@name is 'shadow' and @sprite.thang?.shape in ["rectangle", "box"])
      @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)
+    if @name is 'bounds' and ((@sprite.thang.width isnt @lastWidth or @sprite.thang.height isnt @lastHeight) or (@sprite.thang.drawsBoundsIndex isnt @drawsBoundsIndex))
      oldMark = @mark
      @buildBounds()
      oldMark.parent.addChild @mark
      oldMark.parent.swapChildren oldMark, @mark
      oldMark.parent.removeChild oldMark
-    
+
    if @markSprite?
      @markSprite.scaleFactor = 1.2
      @markSprite.updateScale()
+
+    if @name is 'shadow' and thang = @sprite.thang
+      @mark.scaleX = thang.scaleFactor ? thang.scaleFactorX ? 1
+      @mark.scaleY = thang.scaleFactor ? thang.scaleFactorY ? 1
+
    return unless @name in ["selection", "target", "repair", "highlight"]
-    
+
    # scale these marks to 10m (100px). Adjust based on sprite size.
    factor = 0.3 # default size: 3m width, most commonly for target when pointing to a location

@ -260,7 +285,7 @@ module.exports = class Mark extends CocoClass
      factor = Math.max(factor, 0.3) # lower bound
    @mark.scaleX *= factor
    @mark.scaleY *= factor
-      
+
    if @name in ['selection', 'target', 'repair']
      @mark.scaleY *= @camera.y2x  # code applies perspective

--- a/app/lib/world/vector.coffee
+++ b/app/lib/world/vector.coffee
@ -8,7 +8,7 @@ class Vector
        a.copy()[name](b, useZ)

  isVector: true
-  apiProperties: ['x', 'y', 'magnitude', 'heading', 'distance', 'dot', 'equals', 'copy', 'distanceSquared']
+  apiProperties: ['x', 'y', 'z', 'magnitude', 'heading', 'distance', 'dot', 'equals', 'copy', 'distanceSquared']

  constructor: (@x=0, @y=0, @z=0) ->

--- a/app/lib/world/world.coffee
+++ b/app/lib/world/world.coffee
@ -96,7 +96,7 @@ module.exports = class World
        for thang in @thangs when thang.isProgrammable
          userCode = @userCodeMap[thang.id] ? {}
          for methodName, aether of userCode
-            framesToLoadFlowBefore = if methodName is 'plan' then 200 else 1  # Adjust if plan() is taking even longer
+            framesToLoadFlowBefore = if methodName is 'plan' or methodName is 'makeBid' then 200 else 1  # Adjust if plan() is taking even longer
            aether._shouldSkipFlow = i < loadUntilFrame - framesToLoadFlowBefore
      try
        @getFrame(i)
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Научи се да програмираш на JavaScript, докато играеш игра "
+    slogan: "Научи се да програмираш, докато играеш игра "
    no_ie: "CodeCombat не работи под Internet Explorer 9 или по-стар. Съжалявам!"
    no_mobile: "CodeCombat не е направен за мобилни устройства и може да не работи!"
    play: "Играй"
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Aprén a programar JavaScript tot Jugant"
+    slogan: "Aprén a programar tot Jugant"
    no_ie: "CodeCombat no funciona en Internet Explorer 9 o versions anteriors. Perdó!"
    no_mobile: "CodeCombat no ha estat dissenyat per dispositius mòbils i per tant no funcionarà!"
    play: "Jugar"
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Naučte se programování JavaScriptu při hraní více-hráčové programovací hry."
+    slogan: "Naučte se programování tu při hraní více-hráčové programovací hry."
    no_ie: "Omlouváme se, ale CodeCombat boužel nefunguje v Internet Exploreru 9 nebo starším."
    no_mobile: "CodeCombat není navržen pro mobilní zařízení a nemusí fungovat správně!"
    play: "Hrát"
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Lær at Kode Javascript ved at Spille et Spil"
+    slogan: "Lær at Kode ved at Spille et Spil"
    no_ie: "CodeCombat kan desværre ikke køre i Internet Explorer 9 eller ældre. Beklager!"
    no_mobile: "CodeCombat er ikke designet til mobile enheder og vil måske ikke virke!"
    play: "Spil"
--- a/app/locale/de-CH.coffee
+++ b/app/locale/de-CH.coffee
@ -11,95 +11,95 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
    delay_1_sec: "1 sekunde"
    delay_3_sec: "3 sekunde"
    delay_5_sec: "5 sekunde"
-#    manual: "Manual"
+    manual: "Aleitig"
 #    fork: "Fork"
    play: "Spiele"
    retry: "nomol versuche"
 #    watch: "Watch"
 #    unwatch: "Unwatch"
-#    submit_patch: "Submit Patch"
+    submit_patch: "Patch ireiche"

  units:
-    second: "sekunde"
-    seconds: "sekunde"
-    minute: "minute"
-    minutes: "minute"
-    hour: "stund"
-    hours: "stunde"
-#    day: "day"
-#    days: "days"
-#    week: "week"
-#    weeks: "weeks"
-#    month: "month"
-#    months: "months"
-#    year: "year"
-#    years: "years"
+    second: "Sekunde"
+    seconds: "Sekunde"
+    minute: "Minute"
+    minutes: "Minute"
+    hour: "Stund"
+    hours: "Stunde"
+    day: "Tag"
+    days: "Täg"
+    week: "Wuche"
+    weeks: "Wuche"
+    month: "Monet"
+    months: "Mönet"
+    year: "Johr"
+    years: "Johr"

  modal:
-    close: "beende"
-    okay: "Okaz"
+    close: "Beende"
+    okay: "Okay"

  not_found:
    page_not_found: "Siite nöd gfunde"

  nav:
-#    play: "Levels"
-#    community: "Community"
-#    editor: "Editor"
-#    blog: "Blog"
-#    forum: "Forum"
-#    account: "Account"
-#    admin: "Admin"
-#    home: "Home"
+    play: "Levels"
+    community: "Community"
+    editor: "Editor"
+    blog: "Blog"
+    forum: "Forum"
+    account: "Account"
+    admin: "Admin"
+    home: "Home"
    contribute: "Spende"
 #    legal: "Legal"
    about: "Über"
    contact: "Kontakt"
    twitter_follow: "Folge"
-    employers: "agschtelti"
+    employers: "Mitarbeiter"

-#  versions:
-#    save_version_title: "Save New Version"
-#    new_major_version: "New Major Version"
+  versions:
+    save_version_title: "Neui Version speichere"
+    new_major_version: "Neui Hauptversion"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
 #    cla_suffix: "."
 #    cla_agree: "I AGREE"

-#  login:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    logging_in: "Logging In"
-#    log_out: "Log Out"
-#    recover: "recover account"
+  login:
+    sign_up: "Account erstelle"
+    log_in: "Ilogge"
+    logging_in: "Am Ilogge"
+    log_out: "Uslogge"
+    recover: "Account wiederherstelle"

-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Account wiederherstelle"
+    send_password: "Recovery Password sende"

-#  signup:
-#    create_account_title: "Create Account to Save Progress"
-#    description: "It's free. Just need a couple things and you'll be good to go:"
-#    email_announcements: "Receive announcements by email"
-#    coppa: "13+ or non-USA "
-#    coppa_why: "(Why?)"
-#    creating: "Creating Account..."
-#    sign_up: "Sign Up"
-#    log_in: "log in with password"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
-#    required: "You need to log in before you can go that way."
+  signup:
+    create_account_title: "Erstell en Account zum din Fortschritt speichere"
+    description: "Es isch gratis. Nur no es paar Sache und denn chas los goh:"
+    email_announcements: "Akündigunge per Mail erhalte"
+    coppa: "13+ or Nicht-Amerikaner "
+    coppa_why: "(Warum?)"
+    creating: "Account wird erstellt..."
+    sign_up: "Registriere"
+    log_in: "Mit Passwort ilogge"
+    social_signup: "Du chasch dich au mit Facebook oder G+ registriere:"
+    required: "Du muesch dich zersch ilogge befor du det dure chasch"

-#  home:
-#    slogan: "Learn to Code JavaScript by Playing a Game"
-#    no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!"
-#    no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!"
-#    play: "Play"
-#    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
-#    old_browser_suffix: "You can try anyway, but it probably won't work."
-#    campaign: "Campaign"
-#    for_beginners: "For Beginners"
-#    multiplayer: "Multiplayer"
-#    for_developers: "For Developers"
+  home:
+    slogan: "Lern, wiemer JavaScript programmiert indem du es Spiel spielsch!"
+    no_ie: "CodeCombat funktioniert uf InternetExplorer 9 und älter nid. Sorry!"
+    no_mobile: "CodeCombat isch nid für mobili Grät entwicklet worde und funktioniert vilicht nid!"
+    play: "Spiele"
+    old_browser: "Uh oh, din Browser isch z alt zum CodeCombat spiele. Sorry!"
+    old_browser_suffix: "Du chasches gliich probiere, aber es funktioniert worschinli nid."
+    campaign: "Kampagne"
+    for_beginners: "Für Afänger"
+    multiplayer: "Multiplayer"
+    for_developers: "Für Entwickler"

 #  play:
 #    choose_your_level: "Choose Your Level"
@ -132,47 +132,47 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns."

  diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
+    title: "Hilf, CodeCombat z übersetze!"
+    sub_heading: "Mir bruuched dini Sprochfähigkeite."
    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Swiss German but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Swiss German."
    missing_translations: "Until we can translate everything into Swiss German, you'll see generic German or English when Swiss German isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    learn_more: "Lern meh drüber, en Diplomat zsii"
+    subscribe_as_diplomat: "Abonnier als en Diplomat"

-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
+  wizard_settings:
+    title: "Zaubereristellige"
+    customize_avatar: "Pass din Avatar ah"
 #    active: "Active"
-#    color: "Color"
-#    group: "Group"
-#    clothes: "Clothes"
+    color: "Farb"
+    group: "Gruppe"
+    clothes: "Chleider"
 #    trim: "Trim"
-#    cloud: "Cloud"
-#    team: "Team"
-#    spell: "Spell"
-#    boots: "Boots"
+    cloud: "Wolke"
+    team: "Team"
+    spell: "Zauberspruch"
+    boots: "Stiefel"
 #    hue: "Hue"
-#    saturation: "Saturation"
+    saturation: "Sättigung"
 #    lightness: "Lightness"

-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
-#    me_tab: "Me"
-#    picture_tab: "Picture"
-#    upload_picture: "Upload a picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
-#    admin: "Admin"
+  account_settings:
+    title: "Account Istellige"
+    not_logged_in: "Log dich ih oder erstelle en Account zum dini Istellige ändere."
+    autosave: "Änderige werded automatisch gspeicheret"
+    me_tab: "Ich"
+    picture_tab: "Bild"
+    upload_picture: "Es Bild ufelade"
+    wizard_tab: "Zauberer"
+    password_tab: "Passwort"
+    emails_tab: "E-Mails"
+    admin: "Admin"
 #    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
-#    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
-#    email_notifications: "Notifications"
+    new_password: "Neus Passwort"
+    new_password_verify: "Bestätige"
+    email_subscriptions: "E-Mail Abos"
+    email_announcements: "Akündigunge"
+    email_announcements_description: "Bechum Mails mit Neuigkeite und de neuste Entwicklige bi CodeCombat."
+    email_notifications: "Benachrichtigunge"
 #    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
 #    email_any_notes: "Any Notifications"
 #    email_any_notes_description: "Disable to stop all activity notification emails."
--- a/app/locale/de-DE.coffee
+++ b/app/locale/de-DE.coffee
@ -3,7 +3,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    loading: "Lade..."
    saving: "Speichere..."
    sending: "Übertrage..."
-#    send: "Send"
+    send: "Senden"
    cancel: "Abbrechen"
    save: "Speichern"
    publish: "Publiziere"
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Lerne spielend JavaScript"
+    slogan: "Lerne spielend Programmieren"
    no_ie: "CodeCombat läuft nicht im IE8 oder älteren Browsern. Tut uns Leid!"
    no_mobile: "CodeCombat ist nicht für Mobilgeräte optimiert und funktioniert möglicherweise nicht."
    play: "Spielen"
@ -129,7 +129,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    forum_suffix: "."
    send: "Sende Feedback"
    contact_candidate: "Kontaktiere Kandidaten"
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns."
+    recruitment_reminder: "Benutzen Sie dieses Formular um Kontakt zu Kandidaten aufzunehmen, an denen Sie interessiert sind. Bedenken Sie das CodeCombat 15% des ersten Jahresgehaltes berechnet. Diese Gebühr wird fällig wenn Sie den Kandidaten einstellen und ist für 90 Tage rückerstattungsfähig, sollte der Mitarbeiter nicht eingestellt bleiben. Mitarbeiter die für Teilzeit, Remote oder eine Auftragsarbeit eingestellt werden sind kostenlos, das gilt auch für Praktikanten."

  diplomat_suggestion:
    title: "Hilf CodeCombat zu übersetzen!"
@ -176,7 +176,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
 #    email_any_notes: "Any Notifications"
 #    email_any_notes_description: "Disable to stop all activity notification emails."
-#    email_recruit_notes: "Job Opportunities"
+    email_recruit_notes: "Job-Angebote"
 #    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
    contributor_emails: "Unterstützer Email"
    contribute_prefix: "Wir suchen nach Leuten, die mitmachen! Schau dir die"
@ -187,8 +187,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    saved: "Änderungen gespeichert"
    password_mismatch: "Passwörter stimmen nicht überein."
    job_profile: "Jobprofil"
-#    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."
+    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"
    sample_profile: "Ein Beispielprofil ansehen"
    view_profile: "Dein Profil ansehen"

@ -210,8 +210,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    next_city: "Stadt?"
    next_country: "Wähle dein Land."
    next_name: "Name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
+    next_short_description: "Schreibe eine kurze Beschreibung."
+    next_long_description: "Beschreibe deine gewünschte Position"
    next_skills: "Liste mindestens fünf Fähigkeiten."
 #    next_work: "chronicle your work history."
 #    next_education: "recount your educational ordeals."
@ -665,7 +665,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    join_desc_2: "to get started, and check the box below to mark yourself as a brave Archmage and get the latest news by email. Want to chat about what to do or how to get more deeply involved? "
 #    join_desc_3: ", or find us in our "
 #    join_desc_4: "and we'll go from there!"
-#    join_url_email: "Email us"
+    join_url_email: "Emaile uns"
 #    join_url_hipchat: "public HipChat room"
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
@ -698,7 +698,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    scribe_introduction_url_mozilla: "Mozilla Developer Network"
 #    scribe_introduction_suf: " has built. If your idea of fun is articulating the concepts of programming in Markdown form, then this class might be for you."
 #    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"
+    contact_us_url: "Kontaktiere uns"
 #    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"
 #    scribe_subscribe_desc: "Get emails about article writing announcements."
@ -728,7 +728,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    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 Schreiben:"
+    diligent_scribes: "Unsere fleißgen Schreiber:"
    powerful_archmages: "Unsere mächtigen Erzmagier:"
    creative_artisans: "Unsere kreativen Handwerker:"
    brave_adventurers: "Unsere mutigen Abenteurer:"
@ -789,7 +789,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    simple_ai: "Einfache KI"
    warmup: "Aufwärmen"
    vs: "VS"
-#    friends_playing: "Friends Playing"
+    friends_playing: "spielende Freunde"
    log_in_for_friends: "Melde dich an um mit deinen Freunden zu spielen!"
    social_connect_blurb: "Verbinde und spiele gegen deine Freunde!"
 #    invite_friends_to_battle: "Invite your friends to join you in battle!"
@ -798,18 +798,18 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    defeat_the: "Defeat the"
 #    tournament_ends: "Tournament ends"
 #    tournament_ended: "Tournament ended"
-#    tournament_rules: "Tournament Rules"
+    tournament_rules: "Turnier-Regeln"
 #    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: "Regeln"
    winners: "Gewinner"

-#  ladder_prizes:
-#    title: "Tournament Prizes"
+  ladder_prizes:
+    title: "Turnier Preise"
 #    blurb_1: "These prizes will be awarded according to"
 #    blurb_2: "the tournament rules"
 #    blurb_3: "to the top human and ogre players."
-#    blurb_4: "Two teams means double the prizes!"
+    blurb_4: "Zwei Teams heißt die doppelte Anzahl zu gewinnender Preise!"
 #    blurb_5: "(There will be two first place winners, two second-place winners, etc.)"
    rank: "Rang"
    prizes: "Gewinne"
@ -821,8 +821,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    credits: "credits"
 #    one_month_coupon: "coupon: choose either Rails or HTML"
 #    one_month_discount: "discount, 30% off: choose either Rails or HTML"
-#    license: "license"
-#    oreilly: "ebook of your choice"
+    license: "Lizenz"
+    oreilly: "Ebook deiner Wahl"

 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
--- a/app/locale/de.coffee
+++ b/app/locale/de.coffee
@ -3,18 +3,18 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    loading: "Lade..."
    saving: "Speichere..."
    sending: "Übertrage..."
-#    send: "Send"
+    send: "Senden"
    cancel: "Abbrechen"
    save: "Speichern"
-#    publish: "Publish"
-#    create: "Create"
+    publish: "Publiziere"
+    create: "Erstelle"
    delay_1_sec: "1 Sekunde"
    delay_3_sec: "3 Sekunden"
    delay_5_sec: "5 Sekunden"
    manual: "Manuell"
-#    fork: "Fork"
+    fork: "Fork"
    play: "Abspielen"
-#    retry: "Retry"
+    retry: "Erneut versuchen"
 #    watch: "Watch"
 #    unwatch: "Unwatch"
 #    submit_patch: "Submit Patch"
@ -26,14 +26,14 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    minutes: "Minuten"
    hour: "Stunde"
    hours: "Stunden"
-#    day: "day"
-#    days: "days"
-#    week: "week"
-#    weeks: "weeks"
-#    month: "month"
-#    months: "months"
-#    year: "year"
-#    years: "years"
+    day: "Tag"
+    days: "Tage"
+    week: "Woche"
+    weeks: "Wochen"
+    month: "Monat"
+    months: "Monate"
+    year: "Jahr"
+    years: "Jahre"

  modal:
    close: "Schließen"
@ -69,7 +69,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
  login:
    sign_up: "Registrieren"
    log_in: "Einloggen"
-#    logging_in: "Logging In"
+    logging_in: "Logge ein"
    log_out: "Ausloggen"
    recover: "Account wiederherstellen"

@ -86,11 +86,11 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    creating: "Erzeuge Account..."
    sign_up: "Neuen Account anlegen"
    log_in: "mit Passwort einloggen"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
+    social_signup: "oder, du registriest dich über Facebook oder G+:"
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Lerne spielend JavaScript"
+    slogan: "Lerne spielend Programmieren"
    no_ie: "CodeCombat läuft nicht im IE8 oder älteren Browsern. Tut uns Leid!"
    no_mobile: "CodeCombat ist nicht für Mobilgeräte optimiert und funktioniert möglicherweise nicht."
    play: "Spielen"
@ -128,8 +128,8 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    forum_page: "unser Forum"
    forum_suffix: "."
    send: "Sende Feedback"
-#    contact_candidate: "Contact Candidate"
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns."
+    contact_candidate: "Kontaktiere Kandidaten"
+    recruitment_reminder: "Benutzen Sie dieses Formular um Kontakt zu Kandidaten aufzunehmen, an denen Sie interessiert sind. Bedenken Sie das CodeCombat 15% des ersten Jahresgehaltes berechnet. Diese Gebühr wird fällig wenn Sie den Kandidaten einstellen und ist für 90 Tage rückerstattungsfähig, sollte der Mitarbeiter nicht eingestellt bleiben. Mitarbeiter die für Teilzeit, Remote oder eine Auftragsarbeit eingestellt werden sind kostenlos, das gilt auch für Praktikanten."

  diplomat_suggestion:
    title: "Hilf CodeCombat zu übersetzen!"
@ -142,13 +142,13 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
  wizard_settings:
    title: "Zauberer Einstellungen"
    customize_avatar: "Individualisiere deinen Avatar"
-#    active: "Active"
-#    color: "Color"
-#    group: "Group"
+    active: "Aktiv"
+    color: "Farbe"
+    group: "Gruppe"
    clothes: "Kleidung"
    trim: "Applikationen"
    cloud: "Wolke"
-#    team: "Team"
+    team: "Team"
    spell: "Zauber"
    boots: "Stiefel"
    hue: "Farbton"
@ -161,7 +161,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    autosave: "Sichere Änderungen automatisch"
    me_tab: "Ich"
    picture_tab: "Bild"
-#    upload_picture: "Upload a picture"
+    upload_picture: "Ein Bild hochladen"
    wizard_tab: "Zauberer"
    password_tab: "Passwort"
    emails_tab: "Emails"
@ -176,7 +176,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
 #    email_any_notes: "Any Notifications"
 #    email_any_notes_description: "Disable to stop all activity notification emails."
-#    email_recruit_notes: "Job Opportunities"
+    email_recruit_notes: "Job-Angebote"
 #    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
    contributor_emails: "Unterstützer Email"
    contribute_prefix: "Wir suchen nach Leuten, die mitmachen! Schau dir die"
@ -186,119 +186,119 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    error_saving: "Fehler beim Speichern"
    saved: "Änderungen gespeichert"
    password_mismatch: "Passwörter stimmen nicht überein."
-#    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."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
+    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"
+    sample_profile: "Ein Beispielprofil ansehen"
+    view_profile: "Dein Profil ansehen"

  account_profile:
-#    settings: "Settings"
-#    edit_profile: "Edit Profile"
+    settings: "Einstellungen"
+    edit_profile: "Profil editieren"
 #    done_editing: "Done Editing"
    profile_for_prefix: "Profil von "
    profile_for_suffix: ""
 #    featured: "Featured"
 #    not_featured: "Not Featured"
 #    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
+    last_updated: "zuletzt geändert:"
+    contact: "Kontakt"
 #    active: "Looking for interview offers now"
 #    inactive: "Not looking for offers right now"
 #    complete: "complete"
 #    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
+    next_city: "Stadt?"
+    next_country: "Wähle dein Land."
+    next_name: "Name?"
+    next_short_description: "Schreibe eine kurze Beschreibung."
+    next_long_description: "Beschreibe deine gewünschte Position"
+    next_skills: "Liste mindestens fünf Fähigkeiten."
 #    next_work: "chronicle your work history."
 #    next_education: "recount your educational ordeals."
-#    next_projects: "show off up to three projects you've worked on."
+    next_projects: "Zeige bis zu 3 Projekte an denen du gearbeitet hast."
 #    next_links: "add any personal or social links."
-#    next_photo: "add an optional professional photo."
+    next_photo: "Füge ein optionales professionelles Foto hinzu."
 #    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
-#    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
+    example_blog: "Blog"
+    example_personal_site: "Persönliche Seite"
+    links_header: "Persönliche Links"
+    links_blurb: "Verlinke zu anderen Seiten oder Profilen die du hervorheben möchtest, wie z.B. dein GitHub, dein LinkedIn oder deinen Blog."
+    links_name: "Link-Name"
 #    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
+    links_link_blurb: "Link URL"
 #    basics_header: "Update basic info"
 #    basics_active: "Open to Offers"
 #    basics_active_help: "Want interview offers right now?"
 #    basics_job_title: "Desired Job Title"
 #    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
+    basics_city: "Stadt"
+    basics_city_help: "Stadt in der du arbeiten möchtest (oder jetzt lebst)."
+    basics_country: "Land"
+    basics_country_help: "Land in dem du arbeiten möchtest (oder jetzt lebst)."
 #    basics_visa: "US Work Status"
 #    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship?"
 #    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
+    basics_looking_for_full_time: "Vollzeit"
+    basics_looking_for_part_time: "Teilzeit"
+    basics_looking_for_remote: "Remote"
 #    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
+    basics_looking_for_internship: "Praktikum"
 #    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
+    name_header: "Trage deinen Namen ein"
+    name_anonymous: "Anonymer Entwickler"
 #    name_help: "Name you want employers to see, like 'Nick Winter'."
 #    short_description_header: "Write a short description of yourself"
 #    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
 #    short_description: "Tagline"
 #    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
+    skills_header: "Fähigkeiten"
 #    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
+    long_description_header: "Beschreibe deine gewünschte Position"
 #    long_description_blurb: "Tell employers how awesome you are and what role you want."
 #    long_description: "Self Description"
 #    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
+    work_experience: "Berufserfahrung"
 #    work_header: "Chronicle your work history"
 #    work_years: "Years of Experience"
 #    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
 #    work_blurb: "List your relevant work experience, most recent first."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
+    work_employer: "Arbeitgeber"
+    work_employer_help: "Name deines Arbeitgebers."
 #    work_role: "Job Title"
 #    work_role_help: "What was your job title or role?"
 #    work_duration: "Duration"
 #    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
-#    work_description_help: "What did you do there? (140 chars; optional)"
+    work_description: "Beschreibung"
+    work_description_help: "Was hast du dort gemacht (140 Zeichen; optional)"
 #    education: "Education"
 #    education_header: "Recount your academic ordeals"
 #    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
+    education_school: "Schule"
+    education_school_help: "Name deiner Schule."
+    education_degree: "Abschluss"
 #    education_degree_help: "What was your degree and field of study?"
 #    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
+    education_duration_help: "Wann?"
+    education_description: "Beschreibung"
 #    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
 #    our_notes: "Our Notes"
-#    projects: "Projects"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
+    projects: "Projekte"
+    projects_header: "Füge 3 Projekte hinzu"
+    projects_header_2: "Projekte (Top 3)"
 #    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
-#    project_description: "Description"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
+    project_name: "Projekt Name"
+    project_name_help: "Wie wurde das Projekt genannt?"
+    project_description: "Beschreibung"
+    project_description_help: "Beschreibe kurz das Projekt."
+    project_picture: "Bild"
+    project_picture_help: "Lade ein 230x115px oder größeres Bild hoch, welches das Projekt darstellt."
+    project_link: "Link"
+    project_link_help: "Verlinke zu dem Projekt."
+    player_code: "Spieler Code"

-#  employers:
-#    want_to_hire_our_players: "Hire CodeCombat Players"
-#    what: "What is CodeCombat?"
+  employers:
+    want_to_hire_our_players: "Stelle CodeCombat Spieler ein"
+    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."
 #    who: "Who Are the Players?"
 #    who_blurb: "CodeCombateers are software developers who enjoy using their programming skills to play games. They range from college seniors at top 20 engineering programs to 20-year industry veterans."
@ -313,10 +313,10 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    why_blurb_6: "personally screened by us"
 #    why_blurb_7: ". Stop screening and start hiring."
 #    see_candidates: "Click here to see our candidates"
-#    candidate_name: "Name"
+    candidate_name: "Name"
 #    candidate_location: "Location"
 #    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
+    candidate_role: "Rolle"
 #    candidate_top_skills: "Top Skills"
 #    candidate_years_experience: "Yrs Exp"
 #    candidate_last_updated: "Last Updated"
@ -375,10 +375,10 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    skip_tutorial: "Überspringen (Esc)"
    editor_config: "Editor Einstellungen"
    editor_config_title: "Editor Einstellungen"
-#    editor_config_level_language_label: "Language for This Level"
-#    editor_config_level_language_description: "Define the programming language for this particular level."
-#    editor_config_default_language_label: "Default Programming Language"
-#    editor_config_default_language_description: "Define the programming language you want to code in when starting new levels."
+    editor_config_level_language_label: "Sprache für dieses Level"
+    editor_config_level_language_description: "Lege die Programmiersprache für dieses bestimmte Level fest."
+    editor_config_default_language_label: "Voreinstellung Programmiersprache"
+    editor_config_default_language_description: "Definiere die Programmiersprache in der du programmieren möchtest wenn du ein neues Level beginnst."
    editor_config_keybindings_label: "Tastenbelegung"
    editor_config_keybindings_default: "Standard (Ace)"
    editor_config_keybindings_description: "Fügt zusätzliche Tastenkombinationen, bekannt aus anderen Editoren, hinzu"
@ -388,7 +388,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    editor_config_indentguides_description: "Zeigt vertikale Linien an um Einrückungen besser zu sehen."
    editor_config_behaviors_label: "Intelligentes Verhalten"
    editor_config_behaviors_description: "Vervollständigt automatisch Klammern und Anführungszeichen."
-#    keyboard_shortcuts: "Key Shortcuts"
+    keyboard_shortcuts: "Tastenkürzel"
    loading_ready: "Bereit!"
    tip_insert_positions: "Halte 'Umschalt' gedrückt und klicke auf die Karte um die Koordinaten einzufügen."
    tip_toggle_play: "Wechsel zwischen Play und Pause mit Strg+P."
@ -421,14 +421,14 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    time_current: "Aktuell"
    time_total: "Total"
    time_goto: "Gehe zu"
-#    infinite_loop_try_again: "Try Again"
+    infinite_loop_try_again: "Erneut versuchen"
 #    infinite_loop_reset_level: "Reset Level"
-#    infinite_loop_comment_out: "Comment Out My Code"
+    infinite_loop_comment_out: "Meinen Code auskommentieren"

-#  keyboard_shortcuts:
-#    keyboard_shortcuts: "Keyboard Shortcuts"
-#    space: "Space"
-#    enter: "Enter"
+  keyboard_shortcuts:
+    keyboard_shortcuts: "Tastaturkürzel"
+    space: "Leertaste"
+    enter: "Eingabetaste"
 #    escape: "Escape"
 #    cast_spell: "Cast current spell."
 #    continue_script: "Continue past current script."
@ -448,42 +448,42 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    av_entities_sub_title: "Entitäten"
    av_entities_users_url: "Benutzer"
    av_entities_active_instances_url: "Aktive Instanzen"
-#    av_entities_employer_list_url: "Employer List"
+    av_entities_employer_list_url: "Arbeitgeberliste"
    av_other_sub_title: "Sonstige"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
    u_title: "Benutzerliste"
    lg_title: "Letzte Spiele"
 #    clas: "CLAs"

-#  community:
-#    level_editor: "Level Editor"
-#    main_title: "CodeCombat Community"
-#    facebook: "Facebook"
-#    twitter: "Twitter"
-#    gplus: "Google+"
+  community:
+    level_editor: "Level Editor"
+    main_title: "CodeCombat Community"
+    facebook: "Facebook"
+    twitter: "Twitter"
+    gplus: "Google+"

  editor:
    main_title: "CodeCombat Editoren"
    main_description: "Entwerfe deine eigenen Level, Kampagnen, Einheiten und Lernmaterial. Wir stellen alle Werkzeuge zur Verfügung, die Du dafür benötigst!"
    article_title: "Artikel Editor"
    article_description: "Schreiben Sie Artikel, die anderen Spieler einen Überblick über Programmierkonzepte geben und in einer Vielzahl von Ebenen und Kampagnen genutzt werden können."
-#    thang_title: "Thang Editor"
+    thang_title: "Thang Editor"
    thang_description: "Entwerfe Einheiten, definiere ihre Standardlogik, Grafiken und Töne. Zurzeit werden nur Flash Vektorgrafiken unterstützt."
    level_title: "Level Editor"
    level_description: "Beinhaltet die Werkzeuge zum Scripten, Hochladen von Tönen und zur Konstruktion eigener Logik, damit jedes erdenkliches Level erstellt werden kann. Genau die Sachen, die wir selber benutzen!"
 #    achievement_title: "Achievement Editor"
-#    got_questions: "Questions about using the CodeCombat editors?"
+    got_questions: "Fragen zur Benutzung des CodeCombat Editors?"
    contact_us: "setze dich mit uns in Verbindung!"
    hipchat_prefix: "Besuche uns auch in unserem"
    hipchat_url: "HipChat room."
-#    back: "Back"
+    back: "Zurück"
    revert: "Zurücksetzen"
    revert_models: "Models zurücksetzen."
-#    fork_title: "Fork New Version"
-#    fork_creating: "Creating Fork..."
-#    more: "More"
-#    wiki: "Wiki"
-#    live_chat: "Live Chat"
+    fork_title: "Forke neue Version"
+    fork_creating: "Erzeuge Fork..."
+    more: "Mehr"
+    wiki: "Wiki"
+    live_chat: "Live Chat"
    level_some_options: "Einige Einstellungsmöglichkeiten?"
    level_tab_thangs: "Thangs"
    level_tab_scripts: "Skripte"
@ -491,11 +491,11 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    level_tab_components: "Komponenten"
    level_tab_systems: "Systeme"
    level_tab_thangs_title: "Aktuelle Thangs"
-#    level_tab_thangs_all: "All"
+    level_tab_thangs_all: "Alle"
    level_tab_thangs_conditions: "Startbedingungen"
    level_tab_thangs_add: "Thangs hinzufügen"
-#    delete: "Delete"
-#    duplicate: "Duplicate"
+    delete: "Löschen"
+    duplicate: "Duplizieren"
    level_settings_title: "Einstellungen"
    level_component_tab_title: "Aktuelle Komponenten"
    level_component_btn_new: "neue Komponente erstellen"
@ -512,16 +512,16 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    new_component_title: "Neue Komponente erstellen"
    new_component_field_system: "System"
    new_article_title: "Erstelle einen neuen Artikel"
-#    new_thang_title: "Create a New Thang Type"
+    new_thang_title: "Erstelle einen neuen Thang-Typen"
    new_level_title: "Erstelle ein neues Level"
-#    new_article_title_login: "Log In to Create a New Article"
-#    new_thang_title_login: "Log In to Create a New Thang Type"
-#    new_level_title_login: "Log In to Create a New Level"
+    new_article_title_login: "Melde dich an um einen neuen Artikel zu erstellen"
+    new_thang_title_login: "Melde dich an um einen neuen Thang-Typen zu erstellen"
+    new_level_title_login: "Melde dich an um ein neues Level zu erstellen"
 #    new_achievement_title: "Create a New Achievement"
 #    new_achievement_title_login: "Log In to Create a New Achievement"
-#    article_search_title: "Search Articles Here"
-#    thang_search_title: "Search Thang Types Here"
-#    level_search_title: "Search Levels Here"
+    article_search_title: "Durchsuche Artikel hier"
+    thang_search_title: "Durchsuche Thang-Typen hier"
+    level_search_title: "Durchsuche Levels hier"
 #    achievement_search_title: "Search Achievements"
 #    read_only_warning2: "Note: you can't save any edits here, because you're not logged in."

@ -535,13 +535,13 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    body: "Inhalt"
    version: "Version"
    commit_msg: "Commit Nachricht"
-#    version_history: "Version History"
+    version_history: "Versionshistorie"
    version_history_for: "Versionsgeschichte für: "
    result: "Ergebnis"
    results: "Ergebnisse"
    description: "Beschreibung"
    or: "oder"
-#    subject: "Subject"
+    subject: "Betreff"
    email: "Email"
    password: "Passwort"
    message: "Nachricht"
@ -557,7 +557,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    easy: "Einfach"
    medium: "Mittel"
    hard: "Schwer"
-#    player: "Player"
+    player: "Spieler"

  about:
    who_is_codecombat: "Wer ist CodeCombat?"
@ -639,13 +639,13 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    rights_writings: "Writings"
 #    rights_media: "Media (sounds, music) and any other creative content made specifically for that Level and not made generally available when creating Levels."
 #    rights_clarification: "To clarify, anything that is made available in the Level Editor for the purpose of making levels is under CC, whereas the content created with the Level Editor or uploaded in the course of creation of Levels is not."
-#    nutshell_title: "In a Nutshell"
+    nutshell_title: "Zusammenfassung"
 #    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."
+    canonical: "Die englische Version dieses Dokuments ist die definitive, kanonische Version. Sollte es Unterschiede zwischen den Übersetzungen geben, dann hat das englische Dokument Vorrang."

 #  contribute:
 #    page_title: "Contributing"
-#    character_classes_title: "Character Classes"
+    character_classes_title: "Charakter Klassen"
 #    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, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"
@ -665,7 +665,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    join_desc_2: "to get started, and check the box below to mark yourself as a brave Archmage and get the latest news by email. Want to chat about what to do or how to get more deeply involved? "
 #    join_desc_3: ", or find us in our "
 #    join_desc_4: "and we'll go from there!"
-#    join_url_email: "Email us"
+    join_url_email: "Emaile uns"
 #    join_url_hipchat: "public HipChat room"
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
@ -698,7 +698,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    scribe_introduction_url_mozilla: "Mozilla Developer Network"
 #    scribe_introduction_suf: " has built. If your idea of fun is articulating the concepts of programming in Markdown form, then this class might be for you."
 #    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"
+    contact_us_url: "Kontaktiere uns"
 #    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"
 #    scribe_subscribe_desc: "Get emails about article writing announcements."
@ -728,12 +728,12 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    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: "Unsere fleißgen Schreiber:"
+    powerful_archmages: "Unsere mächtigen Erzmagier:"
+    creative_artisans: "Unsere kreativen Handwerker:"
+    brave_adventurers: "Unsere mutigen Abenteurer:"
+    translating_diplomats: "Unsere übersetzenden Diplomaten:"
+    helpful_ambassadors: "Unsere hilfreichen Botschafter:"

  classes:
    archmage_title: "Erzmagier"
@ -756,18 +756,18 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    my_matches: "Meine Matches"
    simulate: "Simuliere"
 #    simulation_explanation: "By simulating games you can get your game ranked faster!"
-#    simulate_games: "Simulate Games!"
+    simulate_games: "Simuliere Spiele!"
 #    simulate_all: "RESET AND SIMULATE GAMES"
-#    games_simulated_by: "Games simulated by you:"
-#    games_simulated_for: "Games simulated for you:"
-#    games_simulated: "Games simulated"
-#    games_played: "Games played"
-#    ratio: "Ratio"
+    games_simulated_by: "Spiele die durch dich simuliert worden:"
+    games_simulated_for: "Spiele die für dich simuliert worden:"
+    games_simulated: "simulierte Spiele"
+    games_played: "gespielte Spiele"
+    ratio: "Ratio"
 #    leaderboard: "Leaderboard"
 #    battle_as: "Battle as "
-#    summary_your: "Your "
-#    summary_matches: "Matches - "
-#    summary_wins: " Wins, "
+    summary_your: "Deine "
+    summary_matches: "Matches - "
+    summary_wins: " Siege, "
 #    summary_losses: " Losses"
 #    rank_no_code: "No New Code to Rank"
 #    rank_my_game: "Rank My Game!"
@ -789,30 +789,30 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    simple_ai: "Einfache KI"
    warmup: "Aufwärmen"
    vs: "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: "spielende Freunde"
+    log_in_for_friends: "Melde dich an um mit deinen Freunden zu spielen!"
+    social_connect_blurb: "Verbinde und spiele gegen deine Freunde!"
 #    invite_friends_to_battle: "Invite your friends to join you in battle!"
 #    fight: "Fight!"
 #    watch_victory: "Watch your victory"
 #    defeat_the: "Defeat the"
-#    tournament_ends: "Tournament ends"
-#    tournament_ended: "Tournament ended"
-#    tournament_rules: "Tournament Rules"
+    tournament_ends: "Turnier endet"
+    tournament_ended: "Turnier beendet"
+    tournament_rules: "Turnier-Regeln"
 #    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"
-#    winners: "Winners"
+    rules: "Regeln"
+    winners: "Gewinner"

-#  ladder_prizes:
-#    title: "Tournament Prizes"
+  ladder_prizes:
+    title: "Turnierpreise"
 #    blurb_1: "These prizes will be awarded according to"
 #    blurb_2: "the tournament rules"
 #    blurb_3: "to the top human and ogre players."
-#    blurb_4: "Two teams means double the prizes!"
+    blurb_4: "Zwei Teams heißt die doppelte Anzahl zu gewinnender Preise!"
 #    blurb_5: "(There will be two first place winners, two second-place winners, etc.)"
-#    rank: "Rank"
-#    prizes: "Prizes"
+    rank: "Rang"
+    prizes: "Gewinne"
 #    total_value: "Total Value"
 #    in_cash: "in cash"
 #    custom_wizard: "Custom CodeCombat Wizard"
@ -821,8 +821,8 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    credits: "credits"
 #    one_month_coupon: "coupon: choose either Rails or HTML"
 #    one_month_discount: "discount, 30% off: choose either Rails or HTML"
-#    license: "license"
-#    oreilly: "ebook of your choice"
+    license: "Lizenz"
+    oreilly: "Ebook deiner Wahl"

 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
@ -838,55 +838,55 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    new_to_programming: ". New to programming? Hit our beginner campaign to skill up."
 #    so_ready: "I Am So Ready for This"

-#  loading_error:
-#    could_not_load: "Error loading from server"
-#    connection_failure: "Connection failed."
-#    unauthorized: "You need to be signed in. Do you have cookies disabled?"
-#    forbidden: "You do not have the permissions."
-#    not_found: "Not found."
-#    not_allowed: "Method not allowed."
-#    timeout: "Server timeout."
-#    conflict: "Resource conflict."
-#    bad_input: "Bad input."
-#    server_error: "Server error."
-#    unknown: "Unknown error."
+  loading_error:
+    could_not_load: "Fehler beim Laden vom Server"
+    connection_failure: "Verbindung fehlgeschlagen."
+    unauthorized: "Du musst angemeldet sein. Hast du Cookies ausgeschaltet?"
+    forbidden: "Sie haben nicht die nötigen Berechtigungen."
+    not_found: "Nicht gefunden."
+    not_allowed: "Methode nicht erlaubt."
+    timeout: "Server timeout."
+    conflict: "Resourcen Konflikt."
+    bad_input: "Falsche Eingabe."
+    server_error: "Server Fehler."
+    unknown: "Unbekannter Fehler."

-#  resources:
-#    your_sessions: "Your Sessions"
-#    level: "Level"
-#    social_network_apis: "Social Network APIs"
-#    facebook_status: "Facebook Status"
-#    facebook_friends: "Facebook Friends"
-#    facebook_friend_sessions: "Facebook Friend Sessions"
-#    gplus_friends: "G+ Friends"
-#    gplus_friend_sessions: "G+ Friend Sessions"
+  resources:
+    your_sessions: "Meine Sessions"
+    level: "Level"
+    social_network_apis: "Social Network APIs"
+    facebook_status: "Facebook Status"
+    facebook_friends: "Facebook Freunde"
+    facebook_friend_sessions: "Facebook Freunde Sessions"
+    gplus_friends: "G+ Freunde"
+    gplus_friend_sessions: "G+ Freunde Sessions"
 #    leaderboard: "Leaderboard"
-#    user_schema: "User Schema"
-#    user_profile: "User Profile"
+    user_schema: "Benutzerschema"
+    user_profile: "Benutzerprofil"
 #    patches: "Patches"
 #    patched_model: "Source Document"
-#    model: "Model"
-#    system: "System"
-#    component: "Component"
-#    components: "Components"
-#    thang: "Thang"
-#    thangs: "Thangs"
-#    level_session: "Your Session"
-#    opponent_session: "Opponent Session"
-#    article: "Article"
-#    user_names: "User Names"
-#    thang_names: "Thang Names"
-#    files: "Files"
-#    top_simulators: "Top Simulators"
+    model: "Model"
+    system: "System"
+    component: "Komponente"
+    components: "Komponenten"
+    thang: "Thang"
+    thangs: "Thangs"
+    level_session: "Deine Session"
+    opponent_session: "Gegner-Session"
+    article: "Artikel"
+    user_names: "Benutzernamen"
+    thang_names: "Thang Namen"
+    files: "Dateien"
+    top_simulators: "Top Simulatoren"
 #    source_document: "Source Document"
-#    document: "Document"
-#    sprite_sheet: "Sprite Sheet"
-#    candidate_sessions: "Candidate Sessions"
+    document: "Dokument"
+    sprite_sheet: "Sprite Sheet"
+    candidate_sessions: "Kandidat-Sessions"

-#  delta:
-#    added: "Added"
-#    modified: "Modified"
-#    deleted: "Deleted"
+  delta:
+    added: "hinzugefügt"
+    modified: "modifiziert"
+    deleted: "gelöscht"
 #    moved_index: "Moved Index"
 #    text_diff: "Text Diff"
 #    merge_conflict_with: "MERGE CONFLICT WITH"
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@ -5,12 +5,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
    sending: "Αποστολή ..."
 #    send: "Send"
    cancel: "Ακύρωση"
-#    save: "Save"
-#    publish: "Publish"
-#    create: "Create"
-#    delay_1_sec: "1 second"
-#    delay_3_sec: "3 seconds"
-#    delay_5_sec: "5 seconds"
+    save: "Αποθήκευση"
+    publish: "Δημοσιοποίηση"
+    create: "Δημιουργία"
+    delay_1_sec: "1 δευτερόλεπτο"
+    delay_3_sec: "3 δευτερόλεπτα"
+    delay_5_sec: "5 δευτερόλεπτα"
 #    manual: "Manual"
 #    fork: "Fork"
 #    play: "Play"
@ -19,21 +19,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    unwatch: "Unwatch"
 #    submit_patch: "Submit Patch"

-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
-#    day: "day"
-#    days: "days"
-#    week: "week"
-#    weeks: "weeks"
-#    month: "month"
-#    months: "months"
-#    year: "year"
-#    years: "years"
+  units:
+    second: "δευτερόλεπτο"
+    seconds: "δευτερόλεπτα"
+    minute: "λεπτό"
+    minutes: "λεπτά"
+    hour: "ώρα"
+    hours: "ώρες"
+    day: "μέρα"
+    days: "μέρες"
+    week: "εβδομάδα"
+    weeks: "εβδομάδες"
+    month: "μήνας"
+    months: "μήνες"
+    year: "χρόνος"
+    years: "χρόνια"

  modal:
    close: "Κλείσε"
@ -43,12 +43,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
    page_not_found: "Η σελίδα δεν βρέθηκε"

  nav:
-#    play: "Levels"
+#    play: "Επίπεδα"
 #    community: "Community"
 #    editor: "Editor"
    blog: "Μπλόγκ"
    forum: "Φόρουμ"
-#    account: "Account"
+    account: "Λογαριασμός"
    admin: "Διαχειριστής"
    home: "Αρχική"
    contribute: "Συμβάλλω"
@ -59,12 +59,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    employers: "Employers"

 #  versions:
-#    save_version_title: "Save New Version"
+    save_version_title: "Αποθήκευση νέας έκδοσης"
 #    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
+    cla_prefix: "Για να αποθηκεύσετε, πρώτα πρέπει να συμφωνήσετε στα"
 #    cla_url: "CLA"
 #    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_agree: "ΣΥΜΦΩΝΩ"

  login:
    sign_up: "Δημιούργησε Λογαριασμό"
@ -75,31 +75,31 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre

  recover:
    recover_account_title: "Κάντε ανάκτηση του λογαριασμού σας"
-#    send_password: "Send Recovery Password"
+    send_password: "Αποστολή κωδικού ανάκτησης"

  signup:
-#    create_account_title: "Create Account to Save Progress"
+    create_account_title: "Δημιουργία λογαριασμού για αποθήκευση της προόδου"
    description: "Είναι δωρεάν. Απλώς χρειάζεται να έχεις έναν λογαριασμό και θα είσαι έτοιμος να παίξεις:"
    email_announcements: "Λαμβάνετε ανακοινώσεις μέσω e-mail"
    coppa: "13+ ή Εκτός Αμερικής "
-    coppa_why: "(Γιάτι?)"
+    coppa_why: "(Γιατί;)"
    creating: "Δημιουργία λογαριασμού"
-    sign_up: "Εγγραγή"
-    log_in: "Σύνδεση με κώδικο"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
+    sign_up: "Εγγραφή"
+    log_in: "Σύνδεση με κωδικό"
+    social_signup: "Ή, μπορείς να συνδεθείς μέσω του Facebook ή του G+:"
 #    required: "You need to log in before you can go that way."

  home:
    slogan: "Μάθε να προγραμμάτιζεις με JavaScript μέσω ενός παιχνιδιού"
-    no_ie: "Το CodeCombat δεν παίζει με το Internet Explorer 9 ή κάποια παλαιότερη έκδοση.Συγνώμη!"
+    no_ie: "Το CodeCombat δεν παίζει με το Internet Explorer 9 ή κάποια παλαιότερη έκδοση. Συγνώμη!"
    no_mobile: "Το CodeCombat δεν σχεδιάστηκε για κινητά και μπορεί να μην δουλεύει!"
    play: "Παίξε"
-#    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
-#    old_browser_suffix: "You can try anyway, but it probably won't work."
-#    campaign: "Campaign"
-#    for_beginners: "For Beginners"
+    old_browser: "Ωχ, ο περιηγητής σας είναι πολύ παλιός για να τρέξετε το CodeCombat. Συγνώμη!"
+    old_browser_suffix: "Μπορείτε να δοκιμάσετε, αλλά πιθανών να μην λειτουργήσει."
+    campaign: "Εκστρατεία"
+    for_beginners: "Για αρχάριους"
 #    multiplayer: "Multiplayer"
-#    for_developers: "For Developers"
+    for_developers: "Για προγραμματιστές"

  play:
    choose_your_level: "Διάλεξε την πίστα σου"
@ -139,21 +139,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
    learn_more: "Μάθετε περισσότερα σχετικά με το να είστε ένας Διπλωμάτης"
    subscribe_as_diplomat: "Εγγραφή ως Διπλωμάτης"

-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
-#    active: "Active"
-#    color: "Color"
-#    group: "Group"
-#    clothes: "Clothes"
+  wizard_settings:
+    title: "Ρυθμίσεις Μάγου"
+    customize_avatar: "Διαμόρφωσε το  Avatar σου"
+    active: "Ενεργό"
+    color: "Χρώμα"
+    group: "Ομάδα"
+    clothes: "Ρούχα"
 #    trim: "Trim"
-#    cloud: "Cloud"
-#    team: "Team"
-#    spell: "Spell"
-#    boots: "Boots"
-#    hue: "Hue"
-#    saturation: "Saturation"
-#    lightness: "Lightness"
+    cloud: "Σύννεφο"
+#    team: "Ομάδα"
+    spell: "Ξόρκι"
+    boots: "Μπότες"
+    hue: "Απόχρωση"
+    saturation: "Κορεσμός"
+    lightness: "Φωτεινότητα"

  account_settings:
    title: "Ρυθμίσεις λογαριασμού"
@ -161,7 +161,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
    autosave: "Οι ρυθμίσεις αποθηκεύονται αυτόματα"
    me_tab: "Εγώ"
    picture_tab: "Φωτογραφία"
-#    upload_picture: "Upload a picture"
+    upload_picture: "Ανέβασμα φωτογραφίας"
    wizard_tab: "Μάγος"
    password_tab: "Κωδικός"
    emails_tab: "Emails"
@ -172,7 +172,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
    email_subscriptions: "Συνδρομές Email"
    email_announcements: "Ανακοινώσεις"
    email_announcements_description: "Λάβετε emails για τα τελευταία νέα και τις εξελίξεις του CodeCombat."
-#    email_notifications: "Notifications"
+    email_notifications: "Ειδοποιήσεις"
 #    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
 #    email_any_notes: "Any Notifications"
 #    email_any_notes_description: "Disable to stop all activity notification emails."
@ -193,25 +193,25 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    view_profile: "View Your Profile"

  account_profile:
-#    settings: "Settings"
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
+    settings: "Ρυθμίσεις"
+    edit_profile: "Επεξεργασία προφίλ"
+    done_editing: "Τέλος επεξεργασίας"
    profile_for_prefix: "Προφίλ για "
 #    profile_for_suffix: ""
 #    featured: "Featured"
 #    not_featured: "Not Featured"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
+    looking_for: "Αναζήτηση για:"
+    last_updated: "Τελευταία ενημερώθηκε:"
+    contact: "Επικοινωνία"
 #    active: "Looking for interview offers now"
 #    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
+    complete: "Ολοκληρωμένο"
+    next: "Επόμενο"
+    next_city: "πόλη;"
+    next_country: "επέλεξε τη χώρα σου."
+    next_name: "όνομα;"
+    next_short_description: "γράψε μία μικρή περιγραφή."
+    next_long_description: "περιέγραψε την επιθυμητή σου θέση."
 #    next_skills: "list at least five skills."
 #    next_work: "chronicle your work history."
 #    next_education: "recount your educational ordeals."
@ -529,35 +529,35 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    edit_btn_preview: "Preview"
 #    edit_article_title: "Edit Article"

-#  general:
-#    and: "and"
-#    name: "Name"
+  general:
+    and: "και"
+    name: "Όνομα"
 #    body: "Body"
-#    version: "Version"
+    version: "Έκδοση"
 #    commit_msg: "Commit Message"
 #    version_history: "Version History"
 #    version_history_for: "Version History for: "
-#    result: "Result"
-#    results: "Results"
-#    description: "Description"
-#    or: "or"
-#    subject: "Subject"
-#    email: "Email"
-#    password: "Password"
-#    message: "Message"
+    result: "Αποτέλεσμα"
+    results: "Αποτελέσματα"
+    description: "Περιγραφή"
+    or: "ή"
+    subject: "Θέμα"
+    email: "Email"
+    password: "Κωδικός"
+    message: "Μήνυμα"
 #    code: "Code"
 #    ladder: "Ladder"
-#    when: "When"
-#    opponent: "Opponent"
-#    rank: "Rank"
-#    score: "Score"
-#    win: "Win"
-#    loss: "Loss"
-#    tie: "Tie"
-#    easy: "Easy"
-#    medium: "Medium"
-#    hard: "Hard"
-#    player: "Player"
+    when: "Όταν"
+    opponent: "Αντίπαλος"
+    rank: "Κατηγορία"
+    score: "Αποτέλεσμα"
+    win: "Νίκη"
+    loss: "Ήττα"
+    tie: "Ισοπαλία"
+    easy: "Εύκολο"
+    medium: "Μέτριο"
+    hard: "Δύσκολο"
+    player: "Παίκτης"

 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@ -735,21 +735,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    translating_diplomats: "Our Translating Diplomats:"
 #    helpful_ambassadors: "Our Helpful Ambassadors:"

-#  classes:
-#    archmage_title: "Archmage"
-#    archmage_title_description: "(Coder)"
-#    artisan_title: "Artisan"
-#    artisan_title_description: "(Level Builder)"
-#    adventurer_title: "Adventurer"
-#    adventurer_title_description: "(Level Playtester)"
-#    scribe_title: "Scribe"
-#    scribe_title_description: "(Article Editor)"
-#    diplomat_title: "Diplomat"
-#    diplomat_title_description: "(Translator)"
-#    ambassador_title: "Ambassador"
-#    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
+  classes:
+    archmage_title: "Αρχιμάγος"
+    archmage_title_description: "(Προγραμματιστής)"
+    artisan_title: "Τεχνίτης"
+    artisan_title_description: "(Δημιουργός επιπέδων)"
+    adventurer_title: "Εξερευνητής"
+    adventurer_title_description: "(Δοκιματής επιπέδων)"
+    scribe_title: "Γραφέας"
+    scribe_title_description: "(Συντάκτης άρθρων)"
+    diplomat_title: "Διπλωμάτης"
+    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."
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@ -90,7 +90,7 @@
    required: "You need to log in before you can go that way."

  home:
-    slogan: "Learn to Code JavaScript by Playing a Game"
+    slogan: "Learn to Code by Playing a Game"
    no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!"
    no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!"
    play: "Play"
@ -302,11 +302,15 @@
    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."
    who: "Who Are the Players?"
-    who_blurb: "CodeCombateers are software developers who enjoy using their programming skills to play games. They range from college seniors at top 20 engineering programs to 20-year industry veterans."
+    who_blurb: "CodeCombateers are CTOs, VPs of Engineering, and graduates of top 20 engineering schools. Our advanced players enjoy playing with difficult code and solving problems."
    how: "How Do We Find Developers?"
    how_blurb: "We host competitive tournaments to attract competitive software engieneers. We then use in-house algorithms to identify the best players among the top 5% of tournament winners."
    why: "Why Hire Through Us?"
    why_blurb_1: "We will save you time. Every CodeCombateer we feaure is "
+    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."
+    response: "What's the response rate?"
+    response_blurb: "Almost every developer you contact on CodeCombat will respond to inquires whether or not they want to interivew. If you would like help finding a candidate for your role, we can make recommendations."
    why_blurb_2: "looking for work"
    why_blurb_3: ", has "
    why_blurb_4: "demonstrated top notch technical skills"
@ -422,6 +426,7 @@
    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
    tip_talk_is_cheap: "Talk is cheap. Show me the code. - Linus Torvalds"
    tip_first_language: "The most disastrous thing that you can ever learn is your first programming language. - Alan Kay"
+    tip_hardware_problem: "Q: How many programmers does it take to change a light bulb?  A: None, it's a hardware problem."
    time_current: "Now:"
    time_total: "Max:"
    time_goto: "Go to:"
@ -887,6 +892,7 @@
    sprite_sheet: "Sprite Sheet"
    candidate_sessions: "Candidate Sessions"
    user_remark: "User Remark"
+    versions: "Versions"

  delta:
    added: "Added"
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Aprende a programar en JavaScript jugando"
+    slogan: "Aprende a programar jugando"
    no_ie: "¡Lo sentimos! CodeCombat no funciona en Internet Explorer 9 o versiones anteriores."
    no_mobile: "¡CodeCombat no fue diseñado para dispositivos móviles y quizás no funcione!"
    play: "Jugar"
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@ -26,14 +26,14 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    minutes: "minutos"
    hour: "hora"
    hours: "horas"
-#    day: "day"
-#    days: "days"
-#    week: "week"
-#    weeks: "weeks"
-#    month: "month"
-#    months: "months"
-#    year: "year"
-#    years: "years"
+    day: "día"
+    days: "días"
+    week: "semana"
+    weeks: "semanas"
+    month: "mes"
+    months: "meses"
+    year: "año"
+    years: "años"

  modal:
    close: "Cerrar"
@ -55,8 +55,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    legal: "Legalidad"
    about: "Sobre nosotros"
    contact: "Contacta"
-    twitter_follow: "Síguenos"
-    employers: "Empleadores"
+    twitter_follow: "Síguenos en Twitter"
+    employers: "Empleados"

  versions:
    save_version_title: "Guardar nueva versión"
@ -74,28 +74,28 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    recover: "recuperar cuenta"

  recover:
-    recover_account_title: "recuperar cuenta"
+    recover_account_title: "Recuperar Cuenta"
    send_password: "Enviar recuperación de contraseña"

  signup:
    create_account_title: "Crea una cuenta para guardar tu progreso"
-    description: "Es gratis. Solo necesitamos un par de cosas y listo para comenzar!"
+    description: "¡Es gratis!. ¡Solo necesitamos un par de cosas y listo para comenzar!"
    email_announcements: "Recibir noticias por correo electrónico"
    coppa: "Soy mayor de 13 o de fuera de los Estados Unidos"
    coppa_why: "(¿Por qué?)"
    creating: "Creando cuenta..."
    sign_up: "Registrarse"
    log_in: "Iniciar sesión con contraseña"
-    social_signup: "o, puedes acceder a través de tu cuenta de Facebook o G+:"
-#    required: "You need to log in before you can go that way."
+    social_signup: "O, puedes acceder a través de tu cuenta de Facebook o G+:"
+    required: "Tienes que estar reginstrado antes de poder seguir por aquí."

  home:
-    slogan: "Aprende a programar JavaScript jugando"
+    slogan: "Aprende a programar jugando"
    no_ie: "CodeCombat no funciona en Internet Explorer 9 o anteriores. ¡Lo sentimos!"
    no_mobile: "¡CodeCombat no fue diseñado para dispositivos móviles y puede que no funcione!"
    play: "Jugar"
    old_browser: "Ay, su navegador es demasiado viejo para ejecutar CodeCombat. ¡Lo sentimos!"
-    old_browser_suffix: "Puede tentar de todos modos, pero probablemente no va a funcionar."
+    old_browser_suffix: "Lo puede intentar de todos modos, pero probablemente no va a funcionar."
    campaign: "Campaña"
    for_beginners: "Para principiantes"
    multiplayer: "Multijugador"
@ -193,9 +193,9 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    view_profile: "Mira tu perfil"

  account_profile:
-#    settings: "Settings"
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
+    settings: "Configuración"
+    edit_profile: "Editar Perfil"
+    done_editing: "Edición Terminada"
    profile_for_prefix: "Perfil de "
    profile_for_suffix: ""
 #    featured: "Featured"
@ -206,11 +206,11 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    active: "Looking for interview offers now"
 #    inactive: "Not looking for offers right now"
 #    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
-#    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
+    next: "Siguiente"
+    next_city: "¿Ciudad?"
+    next_country: "elige tu país."
+    next_name: "¿Nombre?"
+    next_short_description: "escribe una descripción breve."
 #    next_long_description: "describe your desired position."
 #    next_skills: "list at least five skills."
 #    next_work: "chronicle your work history."
@ -219,56 +219,56 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    next_links: "add any personal or social links."
 #    next_photo: "add an optional professional photo."
 #    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
+    example_blog: "Blog"
+    example_personal_site: "Web personal"
 #    links_header: "Personal Links"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
+    links_blurb: "Enlaza otros sitios o perfiles que quieras destacar como tu GitHub, LinkedIn, o tu blog."
+    links_name: "Nombre del enlace"
+    links_name_help: "¿Qué estás enlazando?"
+    links_link_blurb: "URL del enlace"
+    basics_header: "Actualizar información básica"
 #    basics_active: "Open to Offers"
 #    basics_active_help: "Want interview offers right now?"
 #    basics_job_title: "Desired Job Title"
 #    basics_job_title_help: "What role are you looking for?"
-#    basics_city: "City"
-#    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
-#    basics_country_help: "Country you want to work in (or live in now)."
+    basics_city: "Ciudad"
+    basics_city_help: "Ciudad en la que quieres trabajar (o en la que vives actualmente)."
+    basics_country: "País"
+    basics_country_help: "País en la que quieres trabajar (o en la que vives actualmente)."
 #    basics_visa: "US Work Status"
 #    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship?"
 #    basics_looking_for: "Looking For"
-#    basics_looking_for_full_time: "Full-time"
+    basics_looking_for_full_time: "Full-time (tiempo completo)"
 #    basics_looking_for_part_time: "Part-time"
 #    basics_looking_for_remote: "Remote"
 #    basics_looking_for_contracting: "Contracting"
 #    basics_looking_for_internship: "Internship"
 #    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
-#    name_anonymous: "Anonymous Developer"
+    name_header: "Escriba su nombre"
+    name_anonymous: "Desarrollador Anónimo"
 #    name_help: "Name you want employers to see, like 'Nick Winter'."
-#    short_description_header: "Write a short description of yourself"
+    short_description_header: "Escriba una breve descripción sobre usted."
 #    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
 #    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
+    short_description_help: "¿Quién eres, y qué estás buscando? 140 caracteres como máximo."
 #    skills_header: "Skills"
 #    skills_help: "Tag relevant developer skills in order of proficiency."
 #    long_description_header: "Describe your desired position"
 #    long_description_blurb: "Tell employers how awesome you are and what role you want."
-#    long_description: "Self Description"
+    long_description: "Descripción Personal"
 #    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
    work_experience: "Experiencia laboral"
 #    work_header: "Chronicle your work history"
-#    work_years: "Years of Experience"
+    work_years: "Años de experiencia"
 #    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
 #    work_blurb: "List your relevant work experience, most recent first."
 #    work_employer: "Employer"
 #    work_employer_help: "Name of your employer."
 #    work_role: "Job Title"
 #    work_role_help: "What was your job title or role?"
-#    work_duration: "Duration"
+    work_duration: "Duración"
 #    work_duration_help: "When did you hold this gig?"
-#    work_description: "Description"
+    work_description: "Descripción"
 #    work_description_help: "What did you do there? (140 chars; optional)"
    education: "Educación"
 #    education_header: "Recount your academic ordeals"
@ -278,8 +278,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    education_degree: "Degree"
 #    education_degree_help: "What was your degree and field of study?"
 #    education_duration: "Dates"
-#    education_duration_help: "When?"
-#    education_description: "Description"
+    education_duration_help: "¿Cuándo?"
+    education_description: "Descripción"
 #    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
    our_notes: "Nuestras notas"
    projects: "Proyectos"
@ -288,7 +288,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    projects_blurb: "Highlight your projects to amaze employers."
 #    project_name: "Project Name"
 #    project_name_help: "What was the project called?"
-#    project_description: "Description"
+    project_description: "Descripción"
 #    project_description_help: "Briefly describe the project."
 #    project_picture: "Picture"
 #    project_picture_help: "Upload a 230x115px or larger image showing off the project."
@ -298,9 +298,9 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis

  employers:
    want_to_hire_our_players: "¿Quieres contratar jugadores expertos de CodeCombat?"
-#    what: "What is CodeCombat?"
+    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."
-#    who: "Who Are the Players?"
+    who: "¿Quiénes son los jugadores?"
 #    who_blurb: "CodeCombateers are software developers who enjoy using their programming skills to play games. They range from college seniors at top 20 engineering programs to 20-year industry veterans."
 #    how: "How Do We Find Developers?"
 #    how_blurb: "We host competitive tournaments to attract competitive software engieneers. We then use in-house algorithms to identify the best players among the top 5% of tournament winners."
@ -375,9 +375,9 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    skip_tutorial: "Saltar (esc)"
    editor_config: "Conf. editor"
    editor_config_title: "Configuración del editor"
-#    editor_config_level_language_label: "Language for This Level"
+    editor_config_level_language_label: "Lenguaje para este nivel"
 #    editor_config_level_language_description: "Define the programming language for this particular level."
-#    editor_config_default_language_label: "Default Programming Language"
+    editor_config_default_language_label: "Lenguaje de programación por defecto"
 #    editor_config_default_language_description: "Define the programming language you want to code in when starting new levels."
    editor_config_keybindings_label: "Atajos de teclado"
    editor_config_keybindings_default: "Actual (Ace)"
@ -388,7 +388,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    editor_config_indentguides_description: "Se puede ver las líneas verticales que definen el sangrado de una forma más claraDisplays vertical lines to see indentation better."
    editor_config_behaviors_label: "Comportamientos inteligentes"
    editor_config_behaviors_description: "Se completan automáticamente corchetes, paréntesis y comillas."
-#    keyboard_shortcuts: "Key Shortcuts"
+    keyboard_shortcuts: "Atajos de teclado"
    loading_ready: "¡Listo!"
    tip_insert_positions: "Shift+Clic en un punto del mapa para insertarlo en el editor de hechizos."
    tip_toggle_play: "Alterna entre jugar/pausa con Ctrl+P."
@ -425,11 +425,11 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    infinite_loop_reset_level: "Reiniciar nivel"
    infinite_loop_comment_out: "Comenta mi código"

-#  keyboard_shortcuts:
-#    keyboard_shortcuts: "Keyboard Shortcuts"
-#    space: "Space"
-#    enter: "Enter"
-#    escape: "Escape"
+  keyboard_shortcuts:
+    keyboard_shortcuts: "Atajos de teclado"
+    space: "Barra espaciadora (Espacio)"
+    enter: "Enter"
+    escape: "Escape"
 #    cast_spell: "Cast current spell."
 #    continue_script: "Continue past current script."
 #    skip_scripts: "Skip past all skippable scripts."
@ -448,7 +448,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    av_entities_sub_title: "Entidades"
    av_entities_users_url: "Usuarios"
    av_entities_active_instances_url: "Instancias Activas"
-#    av_entities_employer_list_url: "Employer List"
+    av_entities_employer_list_url: "Lista de empleados"
    av_other_sub_title: "Otros"
    av_other_debug_base_url: "Base (para debugging base.jade)"
    u_title: "Lista de Usuarios"
@ -458,9 +458,9 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
  community:
    level_editor: "Editor de niveles"
    main_title: "Comunidad de CodeCombat"
-#    facebook: "Facebook"
-#    twitter: "Twitter"
-#    gplus: "Google+"
+    facebook: "Facebook"
+    twitter: "Twitter"
+    gplus: "Google+"

  editor:
    main_title: "Editores de CodeCombat"
@ -514,15 +514,15 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    new_article_title: "Crear un nuevo artículo"
    new_thang_title: "Crea un nuevo tipo de objeto"
    new_level_title: "Crear un nuevo nivel"
-#    new_article_title_login: "Log In to Create a New Article"
+    new_article_title_login: "Inicia sesión para Crear un Nuevo Artíuclo"
 #    new_thang_title_login: "Log In to Create a New Thang Type"
-#    new_level_title_login: "Log In to Create a New Level"
-#    new_achievement_title: "Create a New Achievement"
-#    new_achievement_title_login: "Log In to Create a New Achievement"
+    new_level_title_login: "Inicia sesión para Crear un Nuevo Nivel"
+    new_achievement_title: "Crea un nuevo Logro"
+    new_achievement_title_login: "Inicia sesión para Crear un Nuevo Logro"
    article_search_title: "Buscar artículos aquí"
    thang_search_title: "Busca tipos de objetos aquí"
    level_search_title: "Buscar niveles aquí"
-#    achievement_search_title: "Search Achievements"
+    achievement_search_title: "Buscar Logros"
    read_only_warning2: "Nota: no puedes guardar nada de lo que edites aqui porque no has iniciado sesión."

  article:
@ -790,7 +790,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    warmup: "calentamiento"
    vs: "VS"
    friends_playing: "Amigos jugando"
-#    log_in_for_friends: "Log in to play with your friends!"
+    log_in_for_friends: "¡Inicia sesión para jugar con tus amigos!"
    social_connect_blurb: "¡Conectate y juega contra tus amigos!"
    invite_friends_to_battle: "¡Invita a tus amigos a unirse a la batalla!"
    fight: "¡Pelea!"
@ -801,22 +801,22 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    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"
-#    winners: "Winners"
+    rules: "Reglas"
+    winners: "Ganadores"

-#  ladder_prizes:
+  ladder_prizes:
 #    title: "Tournament Prizes"
 #    blurb_1: "These prizes will be awarded according to"
 #    blurb_2: "the tournament rules"
 #    blurb_3: "to the top human and ogre players."
 #    blurb_4: "Two teams means double the prizes!"
 #    blurb_5: "(There will be two first place winners, two second-place winners, etc.)"
-#    rank: "Rank"
-#    prizes: "Prizes"
+    rank: "Rango"
+    prizes: "Premios"
 #    total_value: "Total Value"
 #    in_cash: "in cash"
-#    custom_wizard: "Custom CodeCombat Wizard"
-#    custom_avatar: "Custom CodeCombat avatar"
+    custom_wizard: "Personaliza tu Mago de CodeCombat"
+    custom_avatar: "Personaliza tu avatar de CoceCombat"
 #    heap: "for six months of \"Startup\" access"
 #    credits: "credits"
 #    one_month_coupon: "coupon: choose either Rails or HTML"
@ -883,11 +883,11 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    sprite_sheet: "Sprite Sheet"
 #    candidate_sessions: "Candidate Sessions"

-#  delta:
-#    added: "Added"
-#    modified: "Modified"
-#    deleted: "Deleted"
+  delta:
+    added: "Añadido"
+    modified: "Modificado"
+    deleted: "Eliminado"
 #    moved_index: "Moved Index"
 #    text_diff: "Text Diff"
 #    merge_conflict_with: "MERGE CONFLICT WITH"
-#    no_changes: "No Changes"
+    no_changes: "Sin Cambios"
--- a/app/locale/es.coffee
+++ b/app/locale/es.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Aprende a programar en JavaScript jugando"
+    slogan: "Aprende a programar jugando"
    no_ie: "CodeCombat no funciona en Internet Explorer 9 o versiones anteriores. ¡Lo sentimos!"
    no_mobile: "¡CodeCombat no fue diseñado para dispositivos móviles y quizás no funcione!"
    play: "Jugar"
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "کد نویسی به زبان جاوااسکریپت را با بازی بیاموزید"
+    slogan: "کد نویسیا با بازی بیاموزید"
    no_ie: "متاسفیم اما بازی بر روی مرورگر های اینترنت اکسپلورر نسخه ۹ به قبل اجرا نمی شود"
    no_mobile: "این بازی برای دستگاه های موبایل طراحی نشده است و بر روی آن ها اجرا نمی شود"
    play: "شروع بازی"
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    required: "Vous devez être connecté pour voir cela"

  home:
-    slogan: "Apprenez à coder en JavaScript tout en jouant"
+    slogan: "Apprenez à coder tout en jouant"
    no_ie: "CodeCombat ne fonctionnera pas sous Internet Explorer 9 ou moins. Désolé !"
    no_mobile: "CodeCombat n'a pas été créé pour les plateformes mobiles donc il est possible qu'il ne fonctionne pas correctement ! "
    play: "Jouer"
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@ -3,7 +3,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
    loading: "Töltés..."
    saving: "Mentés..."
    sending: "Küldés..."
-#    send: "Send"
+    send: "Küldés indítása"
    cancel: "Mégse"
    save: "Mentés"
 #    publish: "Publish"
@ -69,7 +69,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
  login:
    sign_up: "Regisztráció"
    log_in: "Bejelentkezés"
-#    logging_in: "Logging In"
+    logging_in: "Bejelentkezés"
    log_out: "Kijelentkezés"
    recover: "meglévő fiók visszaállítása"

@ -90,7 +90,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
    required: "Csak akkor mehetsz arra, ha már bejelentkeztél."

  home:
-    slogan: "Tanulj meg JavaScript nyelven programozni, miközben játszol!"
+    slogan: "Tanulj meg nyelven programozni, miközben játszol!"
    no_ie: "A CodeCombat nem támogatja az Internet Explorer 9, vagy korábbi verzióit. Bocsi!"
    no_mobile: "A CodeCombat nem mobil eszközökre lett tervezve. Valószínűleg nem működik helyesen."
    play: "Játssz!"
@ -194,8 +194,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t

  account_profile:
 #    settings: "Settings"
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
+    edit_profile: "Szerkeszd meg a profilodat"
+    done_editing: "Szerkesztés kész"
    profile_for_prefix: "Profil "
    profile_for_suffix: " számára"
 #    featured: "Featured"
@ -203,14 +203,14 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
    looking_for: "Keres:"
    last_updated: "Legutóbb napra-készre hozva:"
    contact: "Kapcsolat"
-#    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
+    active: "Azonnali interjú ajánlatokat keresek"
+    inactive: "Most éppen nem keresek interjú ajánlatokat"
 #    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
+    next: "Következő"
+    next_city: "Város?"
 #    next_country: "pick your country."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
+    next_name: "Név?"
+    next_short_description: "adj egy rövid leírást."
 #    next_long_description: "describe your desired position."
 #    next_skills: "list at least five skills."
 #    next_work: "chronicle your work history."
@ -219,7 +219,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    next_links: "add any personal or social links."
 #    next_photo: "add an optional professional photo."
 #    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
+    example_blog: "Blog"
 #    example_personal_site: "Personal Site"
 #    links_header: "Personal Links"
 #    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Impara a programmare in JavaScript giocando"
+    slogan: "Impara a programmare giocando"
    no_ie: "CodeCombat non supporta Internet Explorer 9 o browser precedenti. Ci dispiace!"
    no_mobile: "CodeCombat non è stato progettato per dispositivi mobile e potrebbe non funzionare!"
    play: "Gioca"
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "ゲームをプレイしてJavaScriptを学びましょう"
+    slogan: "ゲームをプレイして学びましょう"
    no_ie: "大変申し訳ありませんが、ご利用のブラウザ（IE8以下）はサポートされていません。(ChromeやFirefoxをご利用ください)"
    no_mobile: "CodeCombat は携帯端末向けに制作されていないため、動作しない可能性があります。"
    play: "ゲームスタート"
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "쉽고 간단한 게임으로 자바스크립트 배우기"
+    slogan: "쉽고 간단한 게임배우기"
    no_ie: "죄송하지만 코드컴뱃은 인터넷 익스플로러 9에서는 동작하지 않습니다."
    no_mobile: "코드 컴뱃은 모바일 기기용으로 제작되지 않았습니다. 아마 동작하지 않을 가능성이 높습니다."
    play: "시작"
--- a/app/locale/ms.coffee
+++ b/app/locale/ms.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Belajar Kod JavaScript Dengan Permainan"
+    slogan: "Belajar Kod bDengan Permainan"
    no_ie: "CodeCombat tidak berfungsi dalam Internet Explorer 9 dan terdahulu. Maaf!"
    no_mobile: "CodeCombat tidak dibangunkan untuk telefon mudah-alih dan tablet dan tidak akan berfungsi!"
    play: "Mula"
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Lær å Kode JavaScript ved å Spille et Spill"
+    slogan: "Lær å Kode ved å Spille et Spill"
    no_ie: "CodeCombat kjører ikke på IE8 eller eldre. Beklager!"
    no_mobile: "CodeCombat ble ikke designet for mobile enheter, og vil muligens ikke virke!"
    play: "Spill"
--- a/app/locale/nl-BE.coffee
+++ b/app/locale/nl-BE.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Leer programmeren in JavaScript door het spelen van een spel"
+    slogan: "Leer programmeren door het spelen van een spel"
    no_ie: "CodeCombat werkt niet in IE8 of ouder. Sorry!"
    no_mobile: "CodeCombat is niet gemaakt voor mobiele apparaten en werkt misschien niet!"
    play: "Speel"
--- a/app/locale/nl-NL.coffee
+++ b/app/locale/nl-NL.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Leer programmeren in JavaScript door het spelen van een spel"
+    slogan: "Leer programmeren door het spelen van een spel"
    no_ie: "CodeCombat werkt niet in IE8 of ouder. Sorry!"
    no_mobile: "CodeCombat is niet gemaakt voor mobiele apparaten en werkt misschien niet!"
    play: "Speel"
--- a/app/locale/nl.coffee
+++ b/app/locale/nl.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Leer programmeren in JavaScript door het spelen van een spel"
+    slogan: "Leer programmeren door het spelen van een spel"
    no_ie: "CodeCombat werkt niet in IE8 of ouder. Sorry!"
    no_mobile: "CodeCombat is niet gemaakt voor mobiele apparaten en werkt misschien niet!"
    play: "Speel"
--- a/app/locale/no.coffee
+++ b/app/locale/no.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Lær å Kode JavaScript ved å Spille et Spill"
+    slogan: "Lær å Kode ved å Spille et Spill"
    no_ie: "CodeCombat kjører ikke på IE8 eller eldre. Beklager!"
    no_mobile: "CodeCombat ble ikke designet for mobile enheter, og vil muligens ikke virke!"
    play: "Spill"
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Naucz się JavaScript grając"
+    slogan: "Naucz się programowania grając"
    no_ie: "CodeCombat nie działa na Internet Explorer 9 lub starszym. Przepraszamy!"
    no_mobile: "CodeCombat nie został zaprojektowany dla użądzeń przenośnych więc może nie działać!"
    play: "Graj"
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@ -26,14 +26,14 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
    minutes: "minutos"
    hour: "hora"
    hours: "horas"
-#    day: "day"
-#    days: "days"
-#    week: "week"
-#    weeks: "weeks"
-#    month: "month"
-#    months: "months"
-#    year: "year"
-#    years: "years"
+    day: "dia"
+    days: "dias"
+    week: "semana"
+    weeks: "semanas"
+    month: "mês"
+    months: "meses"
+    year: "ano"
+    years: "anos"

  modal:
    close: "Fechar"
@ -90,7 +90,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Aprenda a programar em JavaScript enquanto se diverte com um jogo."
+    slogan: "Aprenda a programar enquanto se diverte com um jogo."
    no_ie: "CodeCombat não roda em versões mais antigas que o Internet Explorer 10. Desculpe!"
    no_mobile: "CodeCombat não foi projetado para dispositivos móveis e pode não funcionar!"
    play: "Jogar"
@ -205,11 +205,11 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
    contact: "Contato"
 #    active: "Looking for interview offers now"
 #    inactive: "Not looking for offers right now"
-#    complete: "complete"
-#    next: "Next"
-#    next_city: "city?"
+    complete: "Completo"
+    next: "Próximo"
+    next_city: "Cidade?"
 #    next_country: "pick your country."
-#    next_name: "name?"
+    next_name: "Nome?"
 #    next_short_description: "write a short description."
 #    next_long_description: "describe your desired position."
 #    next_skills: "list at least five skills."
@ -219,7 +219,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    next_links: "add any personal or social links."
 #    next_photo: "add an optional professional photo."
 #    next_active: "mark yourself open to offers to show up in searches."
-#    example_blog: "Blog"
+    example_blog: "Blog"
 #    example_personal_site: "Personal Site"
 #    links_header: "Personal Links"
 #    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
@ -233,7 +233,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    basics_job_title_help: "What role are you looking for?"
 #    basics_city: "City"
 #    basics_city_help: "City you want to work in (or live in now)."
-#    basics_country: "Country"
+    basics_country: "País"
 #    basics_country_help: "Country you want to work in (or live in now)."
 #    basics_visa: "US Work Status"
 #    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship?"
@ -273,7 +273,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
    education: "Educação"
 #    education_header: "Recount your academic ordeals"
 #    education_blurb: "List your academic ordeals."
-#    education_school: "School"
+    education_school: "Escola"
 #    education_school_help: "Name of your school."
 #    education_degree: "Degree"
 #    education_degree_help: "What was your degree and field of study?"
@ -333,10 +333,10 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
    multiplayer: "Multiplayer"
    restart: "Reiniciar"
    goals: "Objetivos"
-#    success: "Success!"
-#    incomplete: "Incomplete"
+    success: "Sucesso!"
+    incomplete: "Incompleto"
 #    timed_out: "Ran out of time"
-#    failing: "Failing"
+    failing: "Falta"
    action_timeline: "Linha do Tempo das Ações"
    click_to_select: "Clique em um personagem para selecioná-lo."
    reload_title: "Recarregar Todo o Código?"
@ -389,7 +389,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
    editor_config_behaviors_label: "Comportamentos Inteligentes"
    editor_config_behaviors_description: "Completar automaticamente colchetes, chaves e aspas."
 #    keyboard_shortcuts: "Key Shortcuts"
-#    loading_ready: "Ready!"
+    loading_ready: "Pronto!"
 #    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
 #    tip_toggle_play: "Toggle play/paused with Ctrl+P."
 #    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
@ -481,7 +481,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
    revert_models: "Reverter Modelos"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
-#    more: "More"
+    more: "Mais"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
    level_some_options: "Algumas  Opções?"
@ -494,8 +494,8 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    level_tab_thangs_all: "All"
    level_tab_thangs_conditions: "Condições de Início"
    level_tab_thangs_add: "Adicionar Thangs"
-#    delete: "Delete"
-#    duplicate: "Duplicate"
+    delete: "Excluir"
+    duplicate: "Duplicar"
    level_settings_title: "Configurações"
    level_component_tab_title: "Componentess Atuais"
    level_component_btn_new: "Criar Novo Componente"
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Aprende a Programar JavaScript ao Jogar um Jogo"
+    slogan: "Aprende a Programar ao Jogar um Jogo"
    no_ie: "O CodeCombat não corre em Internet Explorer 9 ou anterior. Desculpa!"
    no_mobile: "O CodeCombat não foi desenhado para dispositivos móveis e pode não funcionar!"
    play: "Jogar"
--- a/app/locale/pt.coffee
+++ b/app/locale/pt.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Aprenda a programar em JavaScript enquanto se diverte com um jogo."
+    slogan: "Aprenda a programar enquanto se diverte com um jogo."
    no_ie: "CodeCombat não roda em versões mais antigas que o Internet Explorer 10. Desculpe!"
    no_mobile: "CodeCombat não foi projetado para dispositivos móveis e pode não funcionar!"
    play: "Jogar"
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Învață sa scrii JavaScript jucându-te"
+    slogan: "Învață sa scrii cod jucându-te"
    no_ie: "CodeCombat nu merge pe Internet Explorer 9 sau mai vechi. Scuze!"
    no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile si s-ar putea sa nu meargă!"
    play: "Joacă"
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@ -26,13 +26,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
    minutes: "минут(ы)"
    hour: "час"
    hours: "часа(ов)"
-#    day: "day"
+    day: "день"
 #    days: "days"
-#    week: "week"
+    week: "неделя"
 #    weeks: "weeks"
-#    month: "month"
+    month: "месяц"
 #    months: "months"
-#    year: "year"
+    year: "год"
 #    years: "years"

  modal:
@ -87,10 +87,10 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
    sign_up: "Регистрация"
    log_in: "вход с паролем"
    social_signup: "Или вы можете зарегистрироваться через Facebook или G+:"
-#    required: "You need to log in before you can go that way."
+    required: "Войдите для того чтобы продолжить."

  home:
-    slogan: "Научитесь программировать на JavaScript, играя в игру"
+    slogan: "Научитесь программировать, играя в игру"
    no_ie: "CodeCombat не работает в IE8 или более старых версиях. Нам очень жаль!"
    no_mobile: "CodeCombat не приспособлен для работы на мобильных устройствах и может не работать!"
    play: "Играть"
@ -174,7 +174,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
    email_announcements_description: "Получать email-оповещения о последних новостях CodeCombat."
    email_notifications: "Уведомления"
 #    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
-#    email_any_notes: "Any Notifications"
+    email_any_notes: "Все уведомления"
    email_any_notes_description: "Отключите, чтобы больше не получать извещения."
    email_recruit_notes: "Возможности для работы"
    email_recruit_notes_description: "Если вы действительно хорошо играете, то мы можем связаться с вами для предложения (лучшей) работы."
@ -193,9 +193,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
    view_profile: "Просмотр вашего профиля"

  account_profile:
-#    settings: "Settings"
-#    edit_profile: "Edit Profile"
-#    done_editing: "Done Editing"
+    settings: "Настойки"
+    edit_profile: "Редактировать профиль"
+    done_editing: "Завершить редактирование"
    profile_for_prefix: "Профиль для "
    profile_for_suffix: ""
 #    featured: "Featured"
@ -204,14 +204,14 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
    last_updated: "Последнее обновление:"
    contact: "Контакты"
 #    active: "Looking for interview offers now"
-#    inactive: "Not looking for offers right now"
-#    complete: "complete"
+    inactive: "Не ищу предложений работы в настоящее время"
+    complete: "готово"
    next: "Далее"
    next_city: "Город?"
    next_country: "Выберите вашу страну."
-#    next_name: "name?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
+    next_name: "имя?"
+    next_short_description: "напишите короткое описание."
+    next_long_description: "опишите желаемую позицию"
 #    next_skills: "list at least five skills."
 #    next_work: "chronicle your work history."
 #    next_education: "recount your educational ordeals."
@ -334,9 +334,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
    restart: "Перезапустить"
    goals: "Цели"
    success: "Успешно!"
-#    incomplete: "Incomplete"
-#    timed_out: "Ran out of time"
-#    failing: "Failing"
+    incomplete: "Не завершено"
+    timed_out: "Время истекло"
+    failing: "Неудача"
    action_timeline: "График действий"
    click_to_select: "Выберите персонажа, щёлкнув на нём"
    reload_title: "Перезагрузить код полностью?"
@ -376,9 +376,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
    editor_config: "Настройки редактора"
    editor_config_title: "Настройки редактора"
    editor_config_level_language_label: "Язык для этого уровня"
-#    editor_config_level_language_description: "Define the programming language for this particular level."
+    editor_config_level_language_description: "Выберите язык программирования для этого конкретного уровня."
    editor_config_default_language_label: "Язык по умолчанию"
-#    editor_config_default_language_description: "Define the programming language you want to code in when starting new levels."
+    editor_config_default_language_description: "Выберите язык программирования который вы хотите использовать когда начинаете новый уровень."
    editor_config_keybindings_label: "Сочетания клавиш"
    editor_config_keybindings_default: "По умолчанию (Ace)"
    editor_config_keybindings_description: "Добавляет дополнительные сочетания, известные из популярных редакторов."
@ -792,8 +792,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    friends_playing: "Friends Playing"
 #    log_in_for_friends: "Log in to play with your friends!"
 #    social_connect_blurb: "Connect and play against your friends!"
-#    invite_friends_to_battle: "Invite your friends to join you in battle!"
-#    fight: "Fight!"
+    invite_friends_to_battle: "Пригласить друзей присоединиться к вам в сражении!"
+    fight: "В бой!"
 #    watch_victory: "Watch your victory"
 #    defeat_the: "Defeat the"
 #    tournament_ends: "Tournament ends"
@ -802,7 +802,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    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"
-#    winners: "Winners"
+    winners: "Победители"

 #  ladder_prizes:
 #    title: "Tournament Prizes"
@ -821,7 +821,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    credits: "credits"
 #    one_month_coupon: "coupon: choose either Rails or HTML"
 #    one_month_discount: "discount, 30% off: choose either Rails or HTML"
-#    license: "license"
+    license: "лицензия"
 #    oreilly: "ebook of your choice"

  multiplayer_launch:
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Nauč sa programovať v Javascripte pomocou hry"
+    slogan: "Nauč sa programovať pomocou hry"
    no_ie: "CodeCombat nefunguje v prehliadači Internet Explorer 9 a jeho starších verziách. Ospravedlňujeme sa."
    no_mobile: "CodeCombat nebol navrhnutý pre mobilné zariadenia a nemusí na nich fungovať správne!"
    play: "Hraj"
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Научи да пишеш JavaScript играјући игру"
+    slogan: "Научи да пишеш код играјући игру"
    no_ie: "CodeCombat не ради у IE8 и старијим верзијама. Жао нам је!"
    no_mobile: "CodeCombat није дизајниран за мобилне уређаје и може да се деси да не ради!"
    play: "Играј"
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Lär dig att koda Javascript genom att spela ett spel."
+    slogan: "Lär dig att koda genom att spela ett spel."
    no_ie: "CodeCombat fungerar tyvärr inte i IE8 eller äldre."
    no_mobile: "CodeCombat är inte designat för mobila enhter och fungerar kanske inte!"
    play: "Spela"
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Oyun oynayarak JavaScript kodlamayı öğrenin"
+    slogan: "Oyun oynayarak kodlamayı öğrenin"
    no_ie: "CodeCombat maalesef Internet Explorer 9 veya daha eski sürümlerde çalışmaz."
    no_mobile: "CodeCombat mobil cihazlar için tasarlanmamıştır bu sebeple mobil cihazlarda çalışmayabilir."
    play: "Oyna"
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Навчіться програмувати на JavaScript, граючи у гру"
+    slogan: "Навчіться програмувати, граючи у гру"
    no_ie: "На жаль, CodeCombat не працює в IE8 чи більш старих версіях!"
    no_mobile: "CodeCombat не призначений для мобільних приладів і може не працювати!"
    play: "Грати"
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "Học mã Javascript bằng chơi Games"
+    slogan: "Học mã bằng chơi Games"
    no_ie: "Codecombat không chạy trong Internet Explorer 9 hoặc cũ hơn. Xin lỗi!"
    no_mobile: "Codecombat không được thiết kế cho các thiết bị di động và có thể không hoạt động được!"
    play: "Chơi"
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "通过游戏学习 Javascript"
+    slogan: "通过游戏学习编程"
    no_ie: "抱歉！ Internet Explorer 9 等旧式预览器无法使用本网站。"
    no_mobile: "CodeCombat 不是针对手机设备设计的，所以可能无法达到最好的体验！"
    play: "开始游戏"
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "通過玩遊戲學習Javascript 腳本語言"
+    slogan: "通過玩遊戲學習編程"
    no_ie: "抱歉！Internet Explorer 9 等舊的瀏覽器打不開此網站"
    no_mobile: "CodeCombat 不是針對手機設備設計的，所以可能會出問題！"
    play: "開始遊戲"
--- a/app/locale/zh-WUU-HANT.coffee
+++ b/app/locale/zh-WUU-HANT.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "打遊戲來學 Javascript"
+    slogan: "打遊戲來學編程"
    no_ie: "對弗住！箇網站叻 Internet Explorer 9 箇粒老個瀏覽器嘸處用。"
    no_mobile: "CodeCombat 勿是照手機設備設計個，怪得嘸數达弗到頂讚個享受！"
    play: "遊戲開打"
--- a/app/locale/zh.coffee
+++ b/app/locale/zh.coffee
@ -90,7 +90,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    required: "You need to log in before you can go that way."

  home:
-    slogan: "通过游戏学习Javascript脚本语言"
+    slogan: "通过游戏学习编程"
    no_ie: "抱歉！Internet Explorer 9等更旧的预览器打不开此网站"
    no_mobile: "CodeCombat暂时没有手机版本，可能无法运行!"
    play: "玩"
--- a/app/models/CocoModel.coffee
+++ b/app/models/CocoModel.coffee
@ -64,7 +64,7 @@ class CocoModel extends Backbone.Model

  @backedUp = {}
  schema: -> return @constructor.schema
-    
+
  getValidationErrors: ->
    errors = tv4.validateMultiple(@attributes, @constructor.schema or {}).errors
    return errors if errors?.length
@ -76,7 +76,7 @@ class CocoModel extends Backbone.Model
      for error in errors
        console.debug "\t", error.dataPath, ":", error.message
      return errors
-  
+
  save: (attrs, options) ->
    options ?= {}
    options.headers ?= {}
@ -97,19 +97,19 @@ class CocoModel extends Backbone.Model
      noty text: "#{errorMessage}: #{res.status} #{res.statusText}", layout: 'topCenter', type: 'error', killer: false, timeout: 10000
    @trigger "save", @
    return super attrs, options
-    
+
  patch: (options) ->
    return false unless @_revertAttributes
    options ?= {}
    options.patch = true
-    
+
    attrs = {_id: @id}
    keys = []
    for key in _.keys @attributes
      unless _.isEqual @attributes[key], @_revertAttributes[key]
        attrs[key] = @attributes[key]
        keys.push key
-    
+
    return unless keys.length
    console.debug 'Patching', @get('name') or @, keys
    @save(attrs, options)
@ -207,8 +207,13 @@ class CocoModel extends Backbone.Model

  applyDelta: (delta) ->
    newAttributes = $.extend(true, {}, @attributes)
-    jsondiffpatch.patch newAttributes, delta
+    try
+      jsondiffpatch.patch newAttributes, delta
+    catch error
+      console.error "Error applying delta", delta, "to attributes", newAttributes, error
+      return false
    @set newAttributes
+    return true

  getExpandedDelta: ->
    delta = @getDelta()
--- a/app/models/LevelSession.coffee
+++ b/app/models/LevelSession.coffee
@ -34,5 +34,5 @@ module.exports = class LevelSession extends CocoModel
    for item in thangSpellArr
      thang = item[0]
      spell = item[1]
-      return true if c1[thang][spell] isnt c2[thang][spell]
+      return true if c1[thang][spell] isnt c2[thang]?[spell]
    false
--- a/app/models/SuperModel.coffee
+++ b/app/models/SuperModel.coffee
@ -122,7 +122,7 @@ module.exports = class SuperModel extends Backbone.Model
    return @progress is 1.0 or not @denom

  addModelResource: (modelOrCollection, name, fetchOptions, value=1) ->
-    modelOrCollection.saveBackups = @shouldSaveBackups(modelOrCollection)
+    modelOrCollection.saveBackups = modelOrCollection.saveBackups or @shouldSaveBackups(modelOrCollection)
    @checkName(name)
    res = new ModelResource(modelOrCollection, name, fetchOptions, value)
    @storeResource(res, value)
--- a/app/schemas/models/level.coffee
+++ b/app/schemas/models/level.coffee
@ -103,10 +103,10 @@ NoteGroupSchema = c.object {title: "Note Group", description: "A group of notes
    highlight: c.object {title: "Highlight", description: "Highlight the target DOM selector string with a big arrow."},
      target: c.shortString(title: "Target", description: "Target highlight element DOM selector string.")
      delay: {type: 'integer', minimum: 0, title: "Delay", description: "Show the highlight after this many milliseconds. Doesn't affect the dim shade cutout highlight method."}
-      offset:  _.extend _.cloneDeep(PointSchema), {title: 'Offset', description: 'Pointing arrow tip offset in pixels from the default target.', format: null}
+      offset: _.extend _.cloneDeep(PointSchema), {title: 'Offset', description: 'Pointing arrow tip offset in pixels from the default target.', format: null}
      rotation: {type: 'number', minimum: 0, title: "Rotation", description: "Rotation of the pointing arrow, in radians. PI / 2 points left, PI points up, etc."}
      sides: c.array {title: "Sides", description: "Which sides of the target element to point at."}, {type: 'string', 'enum': ['left', 'right', 'top', 'bottom'], title: "Side", description: "A side of the target element to point at."}
-    lock: {title: "Lock", description: "Whether the interface should be locked so that the player's focus is on the script, or specific areas to lock.", type: ['boolean', 'array'], items: {type: 'string', enum: ['surface', 'editor', 'palette', 'hud', 'playback', 'playback-hover', 'level', ]}}
+    lock: {title: "Lock", description: "Whether the interface should be locked so that the player's focus is on the script, or specific areas to lock.", type: ['boolean', 'array'], items: {type: 'string', enum: ['surface', 'editor', 'palette', 'hud', 'playback', 'playback-hover', 'level']}}
    letterbox: {type: 'boolean', title: 'Letterbox', description:'Turn letterbox mode on or off. Disables surface and playback controls.'}

  goals: c.object {title: "Goals (Old)", description: "Deprecated. Goals added here have no effect. Add goals in the level settings instead."},
@ -228,7 +228,7 @@ _.extend LevelSchema.properties,
    links: [{rel: "extra", href: "/db/level/{($)}"}, {rel:'db', href: "/db/level/{(original)}/version/{(majorVersion)}"}],
    format: 'latest-version-reference',
    title: "Next Level",
-    description: "Reference to the next level players will player after beating this one."
+    description: "Reference to the next level players will play after beating this one."
  }
  scripts: c.array {title: "Scripts", description: "An array of scripts that trigger based on what the player does and affect things outside of the core level simulation.", "default": []}, ScriptSchema
  thangs: c.array {title: "Thangs", description: "An array of Thangs that make up the level.", "default": []}, LevelThangSchema
@ -253,4 +253,4 @@ module.exports = LevelSchema
 # 2. Open up the Treema demo page http://localhost:9090/demo.html
 # 3. tv4.addSchema(metaschema.id, metaschema)
 # 4. S = <paste big schema here>
-# 5. tv4.validateMultiple(S, metaschema)   and look for errors
+# 5. tv4.validateMultiple(S, metaschema) and look for errors
--- a/app/schemas/models/level_component.coffee
+++ b/app/schemas/models/level_component.coffee
@ -26,14 +26,32 @@ PropertyDocumentationSchema = c.object {
  name: {type: 'string', title: "Name", description: "Name of the property."}
  # not actual JS types, just whatever they describe...
  type: c.shortString(title: "Type", description: "Intended type of the property.")
-  description: {title: "Description", type: 'string', description: "Description of the property.", format: 'markdown', maxLength: 1000}
+  description:
+    oneOf: [
+      {title: "Description", type: 'string', description: "Description of the property.", maxLength: 1000, format: 'markdown'}
+      {
+        type: 'object',
+        title: "Language Descriptions",
+        description: "Property descriptions by code language.",
+        additionalProperties: {type: 'string', description: "Description of the property.", maxLength: 1000, format: 'markdown'}
+      }
+    ]
  args: c.array {title: "Arguments", description: "If this property has type 'function', then provide documentation for any function arguments."}, c.FunctionArgumentSchema
  owner: {title: "Owner", type: 'string', description: 'Owner of the property, like "this" or "Math".'}
-  example: {title: "Example", type: 'string', description: 'An optional example code block.', format: 'javascript'}
+  example:
+    oneOf: [
+      {title: "Example", type: 'string', description: 'An optional example code block.', format: 'javascript'}
+      {
+        type: 'object',
+        title: "Language Examples",
+        description: "Examples by code language.",
+        additionalProperties: {type: 'string', description: 'An example code block.', format: 'javascript'}  # TODO: not JS
+      }
+    ]
  snippets: c.object {
-    title: "Snippets", 
+    title: "Snippets",
    description: "List of snippets for the respective programming languages"
-  }, 
+  },
    javascript: c.object {title: 'JavaScript'}, c.codeSnippet 'javascript'
    coffeescript: c.object {title: 'CoffeeScript'}, c.codeSnippet 'coffee'
    python: c.object {title: 'Python'}, c.codeSnippet 'python'
@ -47,8 +65,26 @@ PropertyDocumentationSchema = c.object {
    default: {type: 'null'}
  },
    type: c.shortString(title: "Type", description: "Type of the return value")
-    example: c.shortString(title: "Example", description: "Example return value")
-    description: {title: "Description", type: 'string', description: "Description of the return value.", maxLength: 1000}
+    example:
+      oneOf: [
+        c.shortString(title: "Example", description: "Example return value")
+        {
+          type: 'object',
+          title: "Language Examples",
+          description: "Example return values by code language.",
+          additionalProperties: c.shortString(description: 'Example return value.', format: 'javascript')  # TODO: not JS
+        }
+      ]
+    description:
+      oneOf: [
+        {title: "Description", type: 'string', description: "Description of the return value.", maxLength: 1000}
+        {
+          type: 'object',
+          title: "Language Descriptions",
+          description: "Example return values by code language.",
+          additionalProperties: {type: 'string', description: "Description of the return value.", maxLength: 1000}
+        }
+      ]

 DependencySchema = c.object {
  title: "Component Dependency"
--- a/app/schemas/models/user.coffee
+++ b/app/schemas/models/user.coffee
@ -65,7 +65,7 @@ UserSchema = c.object {},
    invisibles: {type: 'boolean', 'default': false}
    indentGuides: {type: 'boolean', 'default': false}
    behaviors: {type: 'boolean', 'default': false}
-    liveCompletion: {type: 'boolean', 'default': false}
+    liveCompletion: {type: 'boolean', 'default': true}

  simulatedBy: {type: 'integer', minimum: 0, default: 0}
  simulatedFor: {type: 'integer', minimum: 0, default: 0}
--- a/app/schemas/schemas.coffee
+++ b/app/schemas/schemas.coffee
@ -164,8 +164,26 @@ me.FunctionArgumentSchema = me.object {
  name: {type: 'string', pattern: me.identifierPattern, title: "Name", description: "Name of the function argument."}
  # not actual JS types, just whatever they describe...
  type: me.shortString(title: "Type", description: "Intended type of the argument.")
-  example: me.shortString(title: "Example", description: "Example value for the argument.")
-  description: {title: "Description", type: 'string', description: "Description of the argument.", maxLength: 1000}
+  example:
+    oneOf: [
+      me.shortString(title: "Example", description: "Example value for the argument.")
+      {
+        type: 'object',
+        title: "Language Examples",
+        description: "Examples by code language.",
+        additionalProperties: me.shortString(description: 'Example value for the argument.')
+      }
+    ]
+  description:
+    oneOf: [
+      {title: "Description", type: 'string', description: "Description of the argument.", maxLength: 1000}
+      {
+        type: 'object',
+        title: "Language Descriptions",
+        description: "Example argument descriptions by code language.",
+        additionalProperties: {type: 'string', description: "Description of the argument.", maxLength: 1000}
+      }
+    ]
  "default":
    title: "Default"
    description: "Default value of the argument. (Your code should set this.)"
--- a/app/schemas/subscriptions/app.coffee
+++ b/app/schemas/subscriptions/app.coffee
@ -42,7 +42,4 @@ module.exports =
    $schema: "http://json-schema.org/draft-04/schema#"
    description: "Published when you successfully logged in with G+"
    type: "object"
-    properties:
-      authResult:
-        type: "string"
-    required: ["authResult"]
+    required: ["access_token"]
--- a/app/schemas/subscriptions/play.coffee
+++ b/app/schemas/subscriptions/play.coffee
@ -63,9 +63,6 @@ module.exports =
  "next-game-pressed":
    {} # TODO schema

-  "focus-editor":
-    {} # TODO schema
-
  "end-current-script":
    {} # TODO schema

@ -87,14 +84,14 @@ module.exports =
      scriptRunning: { type: 'string' }
      noteGroupRunning: { type: 'string' }
      timeSinceLastScriptEnded: { type: 'number' }
-      scriptStates: 
+      scriptStates:
        type: 'object'
        additionalProperties:
          title: 'Script State'
          type: 'object'
          additionalProperties: false
          properties:
-            timeSinceLastEnded: 
+            timeSinceLastEnded:
              type: 'number'
              description: 'seconds since this script ended last'
            timeSinceLastTriggered:
@ -143,7 +140,7 @@ module.exports =
    additionalProperties: false
    properties:
      showModal: { type: 'boolean' }
-      
+
  "level-highlight-dom":
    type: 'object'
    additionalProperties: false
--- a/app/schemas/subscriptions/tome.coffee
+++ b/app/schemas/subscriptions/tome.coffee
@ -67,7 +67,29 @@ module.exports =
  "tome:spell-shown":
    {} # TODO schema

-  # TODO proposition: add tome to name
-  "focus-editor":
+  "tome:focus-editor":
    {} # TODO schema

+  "tome:change-language":
+    title: "Tome Change Language"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when the Tome should update its programming language."
+    type: "object"
+    additionalProperties: false
+    properties:
+      language:
+        type: "string"
+    required: ["language"]
+
+  "tome:spell-changed-language":
+    title: "Spell Changed Language"
+    $schema: "http://json-schema.org/draft-04/schema#"
+    description: "Published when an individual spell has updated its code language."
+    type: "object"
+    additionalProperties: false
+    properties:
+      spell:
+        type: "object"
+      language:
+        type: "string"
+    required: ["spell"]
--- a/app/styles/employers.sass
+++ b/app/styles/employers.sass
@ -49,6 +49,9 @@
    tr
      cursor: pointer

+    tr.expired
+      opacity: 0.5
+
    code
      background-color: rgb(220, 220, 220)
      color: #555
--- a/app/styles/home.sass
+++ b/app/styles/home.sass
@ -32,6 +32,7 @@
    img
      display: block
      margin: 0 auto
+      @include transition(box-shadow .50s ease-in-out)

    text-shadow: 2px 2px 5px black
    
@ -58,14 +59,160 @@
      color: $yellow
      font-size: 90px
      font-family: Bangers
-      @include transition(color .10s linear)
+      @include transition(color .25s ease-in-out)
          
-    &:hover div
+    &:hover div, &.hovered div
      color: lighten($yellow, 20%)
-    &:hover img
+    &:hover img, &.hovered img
      filter: brightness(1.2)
      -webkit-filter: brightness(1.2)
-      box-shadow: 0 0 5px black
+      box-shadow: 0 0 15px black
+
+    .code-language-logo
+      background-color: transparent
+      background-repeat: no-repeat
+      position: absolute
+      right: 35px
+      top: 15px
+      width: 50px
+      height: 50px
+
+      &.inverted
+        filter: invert(100%)
+        -webkit-filter: invert(100%)
+
+  .code-languages
+    margin: 10px 0 30px 0
+
+    &:hover
+      .code-language
+        opacity: 0.6
+
+      .code-language.selected-language:not(:hover)
+        opacity: 0.8
+
+        h2, h3
+          text-shadow: none
+
+        .code-wizard
+          opacity: 0.5
+
+    .code-language
+      cursor: pointer
+      text-align: center
+      position: relative
+      opacity: 0.6
+
+      &:hover
+        opacity: 1
+
+        h2, h3
+          text-shadow: 0px 0px 5px white
+
+        .code-wizard
+          display: block
+          opacity: 1
+
+      &.selected-language
+        opacity: 1
+
+        h2, h3
+          text-shadow: 0px 0px 5px white
+
+        .code-wizard
+          display: block
+
+      .code-wizard
+        position: absolute
+        background: transparent url(/images/pages/home/wizard.png) no-repeat
+        background-size: contain
+        width: 111px
+        height: 97px
+        display: none
+
+      .code-language-beta
+        background: transparent url(/images/pages/home/language_beta_sticker.png) no-repeat
+        background-size: contain
+        width: 100px
+        height: 32px
+        position: absolute
+        right: 20px
+        top: -7px
+
+    .primary-code-languages
+
+      #javascript
+        background: transparent url(/images/pages/home/language_js.png) no-repeat
+        padding-right: 150px
+
+        .code-wizard
+          left: 120px
+
+      #python
+        background: transparent url(/images/pages/home/language_python.png) no-repeat
+        padding-left: 150px
+
+        .code-wizard
+          right: 120px
+
+      .code-language
+        width: 498px
+        height: 153px
+        padding: 30px
+        margin: 0px 0 0 -6px
+
+        .code-wizard
+          top: -65px
+
+        h2
+          margin: 15px 0 5px
+
+    .secondary-code-languages
+      margin-left: -10px
+
+      .col-md-3
+        padding: 0px
+
+      .code-language
+        background: transparent url(/images/pages/home/language_background_small.png) no-repeat
+        width: 250px
+        height: 80px
+        margin: 20px 0 20px 0
+        padding: 20px 20px 20px 70px
+
+        .code-wizard
+          top: -51px
+          left: 89px
+          height: 63px
+
+        .code-language-logo
+          position: absolute
+          left: 15px
+          top: 17px
+          width: 50px
+          height: 50px
+
+        .code-language-beta
+          right: -15px
+          top: -16px
+          height: 24px
+
+        h3
+          margin: 0
+          padding: 0
+
+      #coffeescript .code-language-logo
+        background: transparent url(/images/pages/home/language_logo_coffeescript.png) no-repeat center
+
+      #clojure .code-language-logo
+        background: transparent url(/images/pages/home/language_logo_clojure.png) no-repeat center
+
+      #lua .code-language-logo
+        background: transparent url(/images/pages/home/language_logo_lua.png) no-repeat center
+
+      #io .code-language-logo
+        background: transparent url(/images/pages/home/language_logo_io.png) no-repeat center
+
  
 #multiplayer-launch-modal
  .modal-dialog
--- a/app/styles/play/level/modal/docs.sass
+++ b/app/styles/play/level/modal/docs.sass
@ -1,5 +1,21 @@
 #docs-modal .modal-dialog
  width: 800px
+  
+  .tab-content
+    padding-top: 20px

  li:not(.active) a[data-toggle="tab"]
    cursor: pointer
+
+  img
+    display: block
+    margin: 0 auto
+    
+  em
+    display: block
+    margin: 0 auto
+    text-align: center
+
+  hr
+    border-color: #5c5c5c
+    width: 80%
--- a/app/styles/play/level/tome/spell_debug.sass
+++ b/app/styles/play/level/tome/spell_debug.sass
@ -8,4 +8,11 @@
  padding: 10px
  background: transparent url(/images/level/popover_background.png)
  background-size: 100% 100%
+  .progress
+    position: relative
+    span
+      position: absolute
+      display: block
+      color: black
+      width: 100%
      
--- a/app/styles/play/level/tome/spell_palette.sass
+++ b/app/styles/play/level/tome/spell_palette.sass
@ -60,3 +60,29 @@
    display: inline-block
    margin-right: 3px
    vertical-align: top
+
+  .code-language-logo
+    position: absolute
+    width: 20px
+    height: 20px
+    left: 12px
+    top: 34px
+    z-index: 10
+    background-color: transparent
+    background-repeat: no-repeat
+    background-size: contain
+    cursor: pointer
+
+    &.javascript
+      background-image: url(/images/pages/home/language_logo_javascript.png)
+    &.python
+      background-image: url(/images/pages/home/language_logo_python.png)
+    &.coffeescript
+      background-image: url(/images/pages/home/language_logo_coffeescript.png)
+    &.clojure
+      background-image: url(/images/pages/home/language_logo_clojure.png)
+    &.lua
+      background-image: url(/images/pages/home/language_logo_lua.png)
+    &.io
+      background-image: url(/images/pages/home/language_logo_io.png)
+
--- a/app/templates/admin/employer_list.jade
+++ b/app/templates/admin/employer_list.jade
@ -30,7 +30,9 @@ block content
        tbody
          for employer, index in employers
            - var activity = employer.get('activity') || {};
-            - var linkedIn = employer.get('signedEmployerAgreement').data
+            - var hasLinkedIn = typeof employer.get('signedEmployerAgreement') !== "undefined";
+            - var emptyDate = {date: Date.now()};
+            - var linkedIn = hasLinkedIn ? employer.get('signedEmployerAgreement').data : emptyDate;
            tr(data-employer-id=employer.id)
              td
                img(src=employer.getPhotoURL(50), height=50)
@ -48,7 +50,10 @@ block content
                  if !employer.get('firstName') && !linkedIn.firstName && !employer.get('name')
                    | Anoner
              td
-                a(href=employer.get('signedEmployerAgreement').data.publicProfileUrl)= employer.get('employerAt')
+                if employer.get('signedEmployerAgreement')
+                  a(href=employer.get('signedEmployerAgreement').data.publicProfileUrl)= employer.get('employerAt')
+                else
+                  | Unknown
              td= employer.get('email')
              for a in ['login', 'view_candidate', 'contact_candidate']
                - var act = activity[a];
@ -62,4 +67,4 @@ block content
                    span= moment(act.last).fromNow()
                else
                  td 0
-              td(data-employer-age=(new Date() - new Date(employer.get('signedEmployerAgreement').date)) / 86400 / 1000)= moment(employer.get('signedEmployerAgreement').date).fromNow()
+              td(data-employer-age=(new Date() - new Date(linkedIn.date)) / 86400 / 1000)= moment(employer.get('signedEmployerAgreement') ? employer.get('signedEmployerAgreement').date : linkedIn.date).fromNow()
--- a/app/templates/editor/patch_modal.jade
+++ b/app/templates/editor/patch_modal.jade
@ -7,7 +7,10 @@ block modal-header-content
 block modal-body-content
  .modal-body
    p= patch.get('commitMessage')
-    .changes-stub
+    if deltaWorked
+      .changes-stub
+    else
+      .alert.alert-danger Could not apply this delta to the current version.


 block modal-footer
--- a/app/templates/employers.jade
+++ b/app/templates/employers.jade
@ -23,7 +23,15 @@ block content
  
          h2(data-i18n="employers.who") Who Are the Players?
  
-          p(data-i18n="employers.who_blurb") CodeCombateers are software developers who enjoy using their programming skills to play games. They range from college seniors at top 20 engineering programs to 20-year industry veterans.
+          p(data-i18n="employers.who_blurb") CodeCombateers are CTOs, VPs of Engineering, and graduates of top 20 engineering schools. No junior developers here. Our players enjoy playing with code and solving problems.
+
+        div.information_row
+  
+          img(class="employer_icon" src="/images/pages/employer/employer_icon5.png")
+  
+          h2(data-i18n="employers.cost") Who Are the Players?
+  
+          p(data-i18n="employers.cost_blurb") CodeCombateers are CTOs, VPs of Engineering, and graduates of top 20 engineering schools. No junior developers here. Our players enjoy playing with code and solving problems.
  
      div#rightside
  
@ -31,9 +39,9 @@ block content
  
          img(class="employer_icon" src="/images/pages/employer/employer_icon2.png")
  
-          h2(data-i18n="employers.how") How Do We Find Developers?
+          h2(data-i18n="employers.how") How Much Do we Charge?
  
-          p(data-i18n="employers.how_blurb") We host competitive tournaments to attract competitive software engieneers. We then use in-house algorithms to identify the best players among the top 5% of tournament winners.
+          p(data-i18n="employers.how_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.
  
        div.information_row
  
@ -50,8 +58,13 @@ block content
            strong(data-i18n="employers.why_blurb_6") personally screened by us
            span(data-i18n="employers.why_blurb_7") . Stop screening and start hiring.

-      h3.see-candidates-header
-        a#see-candidates(title='Contact', tabindex=-1, data-toggle="coco-modal", data-target="modal/employer_signup", data-i18n="employers.see_candidates") Click here to see our candidates
+        div.information_row
+  
+          img(class="employer_icon" src="/images/pages/employer/employer_icon6.png")
+  
+          h2(data-i18n="employers.response") What's the Response Rate?
+  
+          p(data-i18n="employers.response_blurb") Almost every developer you contact on CodeCombat will respond to inquires whether or not they want to interivew. If you would like help finding a candidate for your role, we can make recommendations.

  if candidates.length

@ -93,7 +106,9 @@ block content
              for candidate, index in area.candidates
                - var profile = candidate.get('jobProfile');
                - var authorized = candidate.id;  // If we have the id, then we are authorized.
-                tr(data-candidate-id=candidate.id, id=candidate.id)
+                - var profileAge = (new Date() - new Date(profile.updated)) / 86400 / 1000;
+                - var expired = profileAge > 2 * 30.4;
+                tr(data-candidate-id=candidate.id, id=candidate.id, class=expired ? "expired" : "")
                  td
                    if authorized
                      img(src=candidate.getPhotoURL(50), alt=profile.name, title=profile.name, height=50)
@ -115,7 +130,7 @@ block content
                      code= skill
                      span  
                  td= profile.experience
-                  td(data-profile-age=(new Date() - new Date(profile.updated)) / 86400 / 1000)= moment(profile.updated).fromNow()
+                  td(data-profile-age=profileAge)= moment(profile.updated).fromNow()
                  if me.isAdmin()
                    td= remarks[candidate.id] ? remarks[candidate.id].get('contactName') : ''
                  if me.isAdmin() && area.id == 'inactive-candidates'
--- a/app/templates/home.jade
+++ b/app/templates/home.jade
@ -2,31 +2,55 @@ extends /templates/base

 block content

-  h1#site-slogan(data-i18n="home.slogan") Learn to Code JavaScript by Playing a Game
+  h1#site-slogan(data-i18n="home.slogan") Learn to Code by Playing a Game

-  if frontPageContent == 'video'
-    //- if language is Chinese, we use youku, because China can't visit youtube.
-    //- otherwise, we use youtube.
-    if languageName == "zh-HANS"
-      #trailer-wrapper
-        <embed src="http://player.youku.com/player.php/sid/XNjk2Mzg5NjYw/v.swf" style="margin-left:15px; margin-top:8px;"allowFullScreen="true" quality="high" width="920" height="518" wmode="opaque"></embed>
-        img(src="/images/pages/home/video_border.png")
-      #mobile-trailer-wrapper
-        <embed src="http://player.youku.com/player.php/sid/XNjk2Mzg5NjYw/v.swf" style="margin-left:15px; margin-top:8px;"allowFullScreen="true" quality="high" width="280" height="158" wmode="opaque"></embed>
-    else
-      #trailer-wrapper
-        <iframe width="920" height="518" src="//www.youtube.com/embed/1zjaA13k-dA?rel=0&controls=0&modestbranding=1&showinfo=0&iv_load_policy=3&vq=hd720&wmode=transparent" frameborder="0" wmode="opaque" allowfullscreen></iframe>
-        img(src="/images/pages/home/video_border.png")
-      #mobile-trailer-wrapper
-        <iframe src="//www.youtube.com/embed/1zjaA13k-dA" frameborder="0" width="280" height="158"></iframe> 
-    hr
+  .code-languages
+    .primary-code-languages.row
+      .col-md-6
+        .code-language#javascript(data-code-language='javascript')
+          .code-wizard
+          h2 JavaScript
+          p The language of the web. Great for writing websites, web apps, HTML5 games, and servers.

-  else if frontPageContent == 'screenshot'
-    #front-screenshot
-      img(src="/images/pages/home/front_screenshot_01.png", alt="")
+      .col-md-6
+        .code-language.beta#python(data-code-language='python')
+          .code-wizard
+          .code-language-beta
+          h2 Python
+          p Simple yet powerful, Python is a great general purpose programming language.

-  else if frontPageContent == 'nothing'
-    p &nbsp;
+    .secondary-code-languages.row
+      .col-md-3
+        .code-language.beta#coffeescript(data-code-language='coffeescript')
+          .code-language-logo
+          .code-wizard
+          .code-language-beta
+          h3 CoffeeScript
+          p Nicer JavaScript syntax
+
+      .col-md-3
+        .code-language.beta#clojure(data-code-language='clojure')
+          .code-language-logo
+          .code-wizard
+          .code-language-beta
+          h3 Clojure
+          p A modern Lisp
+
+      .col-md-3
+        .code-language.beta#lua(data-code-language='lua')
+          .code-language-logo
+          .code-wizard
+          .code-language-beta
+          h3 Lua
+          p Game scripting language
+
+      .col-md-3
+        .code-language.beta#io(data-code-language='io', title="Careful: Io is still quite buggy")
+          .code-language-logo
+          .code-wizard
+          .code-language-beta
+          h3 Io
+          p Simple but obscure

  .alert.alert-danger.lt-ie10
    strong(data-i18n="home.no_ie") CodeCombat does not run in Internet Explorer 9 or older. Sorry!
@ -49,6 +73,7 @@ block content
        h3(data-i18n="home.campaign") Campaign
        h4(data-i18n="home.for_beginners") For Beginners
      .play-text(data-i18n="home.play") Play
+      .code-language-logo

  a#multiplayer(href="/play/ladder")
    div.game-mode-wrapper
@ -59,5 +84,6 @@ block content
        h3(data-i18n="home.multiplayer") Multiplayer
        h4(data-i18n="home.for_developers") For Developers
      .play-text(data-i18n="home.play") Play
+      .code-language-logo

  .clearfix
--- a/app/templates/modal/versions.jade
+++ b/app/templates/modal/versions.jade
@ -11,17 +11,17 @@ block modal-body-content
    table.table.table-condensed
      tr
        th
-        th(data-i18n="general.name") Name
-        th(data-i18n="general.version") Version
+        th
+        th
+        th
        th(data-i18n="general.commit_msg") Commit Message
      for data in dataList
        tr
          td
            input(type="checkbox", value=data._id).select
-          td
-            a(href="/editor/#{page}/#{data.slug || data._id}")
-              | #{data.name}
          td #{data.version.major}.#{data.version.minor}
+          td= moment(data.created).format('l')
+          td= data.creator
          td #{data.commitMessage}

  div.delta-container
--- a/app/templates/play/ladder/ladder.jade
+++ b/app/templates/play/ladder/ladder.jade
@ -22,7 +22,11 @@ block content
      p
        strong Tournament ended! 
        a(href="#winners") Behold the winners
-        | . Thanks for playing!
+        | . Thanks for playing! You can 
+        strong still play
+        |  Greed and all of our other 
+        a(href="/play/ladder") multiplayer arenas
+        | .
      p
        | Want to commiserate? Head over to 
        a(href="http://discourse.codecombat.com/") the forum
--- a/app/templates/play/level/goals.jade
+++ b/app/templates/play/level/goals.jade
@ -1,7 +1,7 @@
 ul#primary-goals-list
 div.goals-status
  strong(data-i18n="play_level.goals") Goals
-  span.spl.spr :
+  span.spr :
  span(data-i18n="play_level.success").secret.goal-status.success Success!
  span(data-i18n="play_level.incomplete").secret.goal-status.incomplete Incomplete
  span(data-i18n="play_level.timed_out").secret.goal-status.timed-out Ran out of time
--- a/app/templates/play/level/level_loading.jade
+++ b/app/templates/play/level/level_loading.jade
@ -25,6 +25,7 @@
    strong.tip(data-i18n='play_level.tip_impossible') It always seems impossible until it's done. - Nelson Mandela

    strong.tip.rare(data-i18n='play_level.tip_baby_coders') In the future, even babies will be Archmages.
+    strong.tip.rare(data-i18n='play_level.tip_hardware_problem') Q: How many programmers does it take to change a light bulb?  A: None, it's a hardware problem.
    strong.tip.rare(data-i18n='play_level.tip_morale_improves') Loading will continue until morale improves.
    strong.tip.rare(data-i18n='play_level.tip_all_species') We believe in equal opportunities to learn programming for all species.
    strong.tip.rare(data-i18n='play_level.tip_reticulating') Reticulating spines.
@ -42,4 +43,4 @@
      span= me.get('name') || 'Anoner'

  .errors
-  
+  
--- a/app/templates/play/level/tome/spell_debug.jade
+++ b/app/templates/play/level/tome/spell_debug.jade
@ -1,2 +1,6 @@
+div.progress
+  .progress-bar(role="progressbar", aria-valuenow="50", aria-valuemin="0", aria-valuemax="100")
+    span Inspecting variable...
 pre
+  
  code
--- a/app/templates/play/level/tome/spell_list_tab_entry.jade
+++ b/app/templates/play/level/tome/spell_list_tab_entry.jade
@ -2,7 +2,7 @@
  i.icon-chevron-down
 .thang-avatar-placeholder

-code #{spell.name}(#{parameters})
+code #{methodSignature}

 .btn.btn-small.reload-code(title="Reload original code for " + spell.name)
  i.icon-repeat
--- a/app/templates/play/level/tome/spell_palette.jade
+++ b/app/templates/play/level/tome/spell_palette.jade
@ -1,9 +1,10 @@
 img(src="/images/level/code_palette_background.png").code-palette-background
+.code-language-logo
 ul(class="nav nav-pills" + (tabbed ? ' multiple-tabs' : ''))
  each slug, group in entryGroupSlugs
    li(class=group == "this" || slug == "available-spells" ? "active" : "")
      a(data-toggle="pill", data-target='#palette-tab-' + slug)
-        h4= group
+        h4= entryGroupNames[group]
 .tab-content
  each slug, group in entryGroupSlugs
    div(id="palette-tab-" + slug, class="tab-pane nano" + (group == "this" || slug == defaultGroupSlug ? " active" : ""))
--- a/app/templates/play/level/tome/spell_palette_entry_popover.jade
+++ b/app/templates/play/level/tome/spell_palette_entry_popover.jade
@ -11,11 +11,22 @@ if doc.example
  p.example
    strong Example:
    div!= marked("```\n" + doc.example + "```")
-else if doc.type == 'function'
+else if doc.type == 'function' && argumentExamples.length
  p.example
    strong Example:
    div
-      code= doc.owner + '.' + doc.name + '(' + argumentExamples.join(', ') + ');'
+      if language == 'javascript'
+        code= doc.owner + '.' + doc.name + '(' + argumentExamples.join(', ') + ');'
+      else if language == 'coffeescript'
+        code= doc.ownerName + (doc.ownerName == '@' ? '' : '.') + doc.name + ' ' + argumentExamples.join(', ')
+      else if language == 'python'
+        code= doc.ownerName + '.' + doc.name + '(' + argumentExamples.join(', ') + ')'
+      else if language == 'clojure'
+        code= '(.' + doc.name + ' ' + doc.ownerName + ' ' + argumentExamples.join(', ') + ')'
+      else if language == 'lua'
+        code= doc.ownerName + ':' + doc.name + '(' + argumentExamples.join(', ') + ')'
+      else if language == 'io'
+        code= (doc.ownerName == 'this' ? '' : doc.ownerName + ' ') + doc.name + '(' + argumentExamples.join(', ') + ')'

 if (doc.type != 'function' && doc.type != 'snippet') || doc.name == 'now'
  p.value
--- a/app/views/account/profile_view.coffee
+++ b/app/views/account/profile_view.coffee
@ -22,6 +22,7 @@ adminContacts = [
  {id: "5162fab9c92b4c751e000274", name: "Scott"}
  {id: "51eb2714fa058cb20d0006ef", name: "Michael"}
  {id: "51538fdb812dd9af02000001", name: "George"}
+  {id: "52a57252a89409700d0000d9", name: "Ignore"}
 ]

 module.exports = class ProfileView extends View
@ -104,6 +105,7 @@ module.exports = class ProfileView extends View
    @linkedinLoaded = true
    if @waitingForLinkedIn
      @renderLinkedInButton()
+    @authorizedWithLinkedIn = IN?.User?.isAuthorized()

  renderLinkedInButton: =>
    IN?.parse()
--- a/app/views/editor/article/edit.coffee
+++ b/app/views/editor/article/edit.coffee
@ -81,7 +81,7 @@ module.exports = class ArticleEditView extends View
    @preview.focus() if window.focus
    @preview.onload = => @pushChangesToPreview()
    return false
-    
+
  openSaveModal: ->
    @openModalView(new SaveVersionModal({model: @article}))

@ -101,6 +101,7 @@ module.exports = class ArticleEditView extends View
      @disableModalInProgress(modal)

    res.success =>
+      @article.clearBackup()
      modal.modal('hide')
      url = "/editor/article/#{newArticle.get('slug') or newArticle.id}"
      document.location.href = url
--- a/app/views/editor/level/component/edit.coffee
+++ b/app/views/editor/level/component/edit.coffee
@ -25,7 +25,7 @@ module.exports = class LevelComponentEditView extends View
    super options
    @levelComponent = @supermodel.getModelByOriginalAndMajorVersion LevelComponent, options.original, options.majorVersion or 0
    console.log "Couldn't get levelComponent for", options, "from", @supermodel.models unless @levelComponent
-    @onEditorChange = _.debounce @onEditorChange, 1500
+    @onEditorChange = _.debounce @onEditorChange, 1000

  getRenderData: (context={}) ->
    context = super(context)
--- a/app/views/editor/level/save_view.coffee
+++ b/app/views/editor/level/save_view.coffee
@ -76,7 +76,7 @@ module.exports = class LevelSaveView extends SaveVersionModal
      else if @level.isPublished() and not newModel.isPublished()
        newModel.publish()  # Publish any LevelComponents that weren't published yet
      formsToSave.push form
-    
+
    for model in modelsToSave
      if errors = model.getValidationErrors()
        messages = ("\t #{error.dataPath}: #{error.message}" for error in errors)
@ -96,6 +96,8 @@ module.exports = class LevelSaveView extends SaveVersionModal
          forms.applyErrorsToForm($(form), JSON.parse(res.responseText))
        res.success =>
          modelsToSave = _.without modelsToSave, newModel
+          oldModel = _.find @supermodel.models, (m) -> m.get('original') is newModel.get('original')
+          oldModel.clearBackup()  # Otherwise looking at old versions is confusing.
          unless modelsToSave.length
            url = "/editor/level/#{@level.get('slug') or @level.id}"
            document.location.href = url
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`{"split":"preview-2","session.current":["/app/styles/play/level/tome/spell.sass"],"session.open":{"/app/styles/play/level/tome/spell.sass":{"scrollTop":0,"scrollLeft":0,"selection":{"start":{"row":0,"column":0},"end":{"row":0,"column":0}},"lastUse":1402419134780,"undo":[],"redo":[]}},"window":{"width":1680,"height":1024,"top":22,"left":0}}`