Merge pull request #337 from codecombat/master

Syncing level-runner-interface fork

.travis.yml

@@ -1,6 +1,7 @@
-nguage: node_js
+language: node_js
 node_js:
   - 0.10
+
 before_script:
   - "npm install"
   - export DISPLAY=:99.0
@@ -11,3 +12,4 @@ before_script:
 
 script:
   - "./node_modules/.bin/karma start --browsers Firefox --single-run"
+

README.md

@@ -4,7 +4,7 @@ CodeCombat
 ![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/readme_00.png)
 [![Build Status](https://travis-ci.org/codecombat/codecombat.png?branch=master)](https://travis-ci.org/codecombat/codecombat)
 
-CodeCombat is a multiplayer programming game for learning how to code. **See the [Archmage developer wiki](https://github.com/codecombat/codecombat/wiki) for a dev setup guide, extensive documentation, and much more.**
+CodeCombat is a multiplayer programming game for learning how to code. **See the [Archmage developer wiki](https://github.com/codecombat/codecombat/wiki/Archmage-Home) for a dev setup guide, extensive documentation, and much more.**
 
 It's both a startup and a community project, completely open source under the [MIT and Creative Commons licenses](http://codecombat.com/legal). It's the largest open source [CoffeeScript](http://coffeescript.org/) project by lines of code, and since it's a game (with [really cool tech](https://github.com/codecombat/codecombat/wiki/Third-party-software-and-services)), it's really fun to hack on. Join us in teaching the world to code! Your contribution will go on to show millions of players how cool programming can be.
 

app/application.coffee

@@ -8,6 +8,8 @@ CocoView = require 'views/kinds/CocoView'
 preventBackspace = (event) ->
   if event.keyCode is 8 and not elementAcceptsKeystrokes(event.srcElement or event.target)
     event.preventDefault()
+  else if (key.ctrl or key.command) and not key.alt and event.keyCode in [219, 221]  # prevent Ctrl/Cmd + [ / ]
+    event.preventDefault()
 
 elementAcceptsKeystrokes = (el) ->
   # http://stackoverflow.com/questions/1495219/how-can-i-prevent-the-backspace-key-from-navigating-back

app/assets/javascripts/workers/worker_world.coffee

@@ -0,0 +1,140 @@
+
+throw "Attempt to load worker_world into main window instead of web worker." if not self.importScripts or not window?
+
+self.window = self
+self.workerID = "Worker"
+
+self.logLimit = 200
+self.logsLogged = 0
+console =
+  log: ->
+    self.logsLogged += 1
+    if self.logsLogged is self.logLimit
+      self.postMessage
+        type: 'console-log'
+        args: ["Log limit " + self.logLimit + " reached; shutting up."]
+        id: self.workerID
+    else if self.logsLogged < self.logLimit
+      args = [].slice.call arguments
+      for arg in args
+        if arg and arg.constructor and (arg.constructor.className is "Thang" or arg.isComponent)
+          arg = arg.toString()
+
+      try
+        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
+
+
+console.error = console.info = console.log
+self.console = console
+
+importScripts '/javascripts/world.js'
+
+
+self.transferableSupported = transferableSupported = ->
+  try
+    ab = new ArrayBuffer 1
+    worker.postMessage ab, [ab]
+    return ab.byteLength is 0
+  catch error
+    return false
+  return false
+
+
+  World = self.require 'lib/world/world'
+  GoalManager = self.require 'lib/world/GoalManager'
+
+  self.runWorld = runWorld = (args) ->
+    self.postedErrors = {}
+    self.t0 = new Date()
+    self.firstWorld = args.firstWorld
+    self.postedErrors = false
+    self.logsLogged = 0
+
+    try
+      self.world = new World args.worldName, args.userCodeMap
+      if args.level
+        self.world.loadFromLevel args.level, true
+      self.goalManager = new GoalManager self.world
+      self.goalManager.setGoals args.goals
+      self.goalManager.setCode args.userCodeMap
+      self.goalManager.worldGenerationWillBegin()
+      self.world.setGoalManager self.goalManager
+    catch error
+      self.onWorldError error
+      return
+    Math.random = self.world.rand.randf
+    self.world.loadFrames self.onWorldLoaded, self.onWorldError, self.onWorldLoadProgress
+
+self.onWorldLoaded = onWorldLoaded = () ->
+  self.goalManager.worldGenerationEnded()
+  t1 = new Date()
+  diff = t1 - self.t0
+  transferableSupported = self.transferableSupported()
+  try
+    serialized = self.world.serialize()
+  catch error
+    console.log "World serialization error:", error.toString() + "\n" + error.stack or error.stackTrace
+
+
+  t2 = new Date()
+
+  try
+    if transferableSupported
+      self.postMessage(
+        type: 'new-world'
+        serialized: serialized.serializedWorld
+        goalStates: self.goalManager.getGoalStates()
+      , serialized.transferableObjects)
+    else
+      self.postMessage
+        type: 'new-world'
+        serialized: serialized.serializedWorld
+        goalStates: self.goalManager.getGoalStates()
+  catch error
+    console.log "World delivery error:", error.toString + "\n" + error.stack or error.stackTrace
+  t3 = new Date()
+  console.log "And it was so: (" + (diff / self.world.totalFrames).toFixed(3) + "ms per frame,", self.world.totalFrames, "frames)\nSimulation :"
+  self.world = null
+
+self.onWorldError = onWorldError = (error) ->
+  if error instanceof Aether.problems.UserCodeProblem
+    unless self.postedErrors[error.key]
+      problem = error.serialize()
+      self.postMessage
+        type: 'user-code-problem'
+        problem: problem
+      self.postedErrors[error.key] = problem
+
+  else
+    console.log "Non-UserCodeError:", error.toString() + "\n" + error.stack or error.stackTrace
+  return true
+
+self.onWorldLoadProgress = onWorldLoadProgress = (progress) ->
+  self.postMessage
+    type: 'world-load-progress-changed'
+    progress: progress
+
+self.abort = abort = ->
+  if self.world and self.world.name
+    console.log "About to abort:", self.world.name, typeof self.world.abort
+    self.world?.abort()
+    self.world = null
+
+  self.postMessage
+    type: 'abort'
+
+self.reportIn = reportIn = ->
+  self.postMessage
+    type: 'reportIn'
+
+self.addEventListener 'message', (event) ->
+  self[event.data.func](event.data.args)

app/assets/javascripts/workers/worker_world.js

@@ -43,6 +43,12 @@ importScripts('/javascripts/world.js');
 //xhr.open("get", "script.js");
 //xhr.send();
 
+// We could do way more from this: http://stackoverflow.com/questions/10653809/making-webworkers-a-safe-environment
+Object.defineProperty(self, "XMLHttpRequest", {
+  get: function() { throw new Error("Access to XMLHttpRequest is forbidden."); },
+  configurable: false
+});
+
 self.transferableSupported = function transferableSupported() {
   // Not in IE, even in IE 11
   try {

app/collections/ComponentsCollection.coffee

@@ -0,0 +1,7 @@
+LevelComponent = require 'models/LevelComponent'
+CocoCollection = require 'models/CocoCollection'
+
+module.exports = class ComponentsCollection extends CocoCollection
+  url: '/db/level_component/search'
+  model: LevelComponent
+

app/lib/FacebookHandler.coffee

@@ -1,7 +1,7 @@
 CocoClass = require 'lib/CocoClass'
 {me, CURRENT_USER_KEY} = require 'lib/auth'
 {backboneFailure} = require 'lib/errors'
-{saveObjectToStorage} = require 'lib/storage'
+storage = require 'lib/storage'
 
 # facebook user object props to
 userPropsToSave =
@@ -59,7 +59,7 @@ module.exports = FacebookHandler = class FacebookHandler extends CocoClass
       error: backboneFailure,
       url: "/db/user?facebookID=#{r.id}&facebookAccessToken=#{@authResponse.accessToken}"
       success: (model) ->
-        saveObjectToStorage(CURRENT_USER_KEY, model.attributes)
+        storage.save(CURRENT_USER_KEY, model.attributes)
         window.location.reload() if model.get('email') isnt oldEmail
     })
 

app/lib/GPlusHandler.coffee

@@ -1,7 +1,7 @@
 CocoClass = require 'lib/CocoClass'
 {me, CURRENT_USER_KEY} = require 'lib/auth'
 {backboneFailure} = require 'lib/errors'
-{saveObjectToStorage} = require 'lib/storage'
+storage = require 'lib/storage'
 
 # gplus user object props to
 userPropsToSave =
@@ -73,7 +73,7 @@ module.exports = GPlusHandler = class GPlusHandler extends CocoClass
       error: backboneFailure,
       url: "/db/user?gplusID=#{gplusID}&gplusAccessToken=#{@accessToken}"
       success: (model) ->
-        saveObjectToStorage(CURRENT_USER_KEY, model.attributes)
+        storage.save(CURRENT_USER_KEY, model.attributes)
         window.location.reload()
     })
 

app/lib/God.coffee

@@ -152,7 +152,7 @@ class Angel
     @ids[@lastID]
 
   # https://github.com/codecombat/codecombat/issues/81 -- TODO: we need to wait for worker initialization first
-  infiniteLoopIntervalDuration: 15000  # check this often (must be more than the others added)
+  infiniteLoopIntervalDuration: 1500000  # check this often (must be more than the others added)
   infiniteLoopTimeoutDuration: 1500  # wait this long when we check
   abortTimeoutDuration: 500  # give in-process or dying workers this long to give up
   constructor: (@god) ->

app/lib/auth.coffee

@@ -1,6 +1,6 @@
 {backboneFailure, genericFailure} = require 'lib/errors'
 User = require 'models/User'
-{saveObjectToStorage, loadObjectFromStorage} = require 'lib/storage'
+storage = require 'lib/storage'
 
 module.exports.CURRENT_USER_KEY = CURRENT_USER_KEY = 'whoami'
 BEEN_HERE_BEFORE_KEY = 'beenHereBefore'
@@ -10,7 +10,7 @@ module.exports.createUser = (userObject, failure=backboneFailure) ->
   user.save({}, {
   error: failure,
   success: (model) ->
-    saveObjectToStorage(CURRENT_USER_KEY, model)
+    storage.save(CURRENT_USER_KEY, model)
     window.location.reload()
   })
 
@@ -21,7 +21,7 @@ module.exports.loginUser = (userObject, failure=genericFailure) ->
       password:userObject.password
     },
   (model) ->
-    saveObjectToStorage(CURRENT_USER_KEY, model)
+    storage.save(CURRENT_USER_KEY, model)
     window.location.reload()
   )
   jqxhr.fail(failure)
@@ -29,7 +29,7 @@ module.exports.loginUser = (userObject, failure=genericFailure) ->
 module.exports.logoutUser = ->
   FB?.logout?()
   res = $.post('/auth/logout', {}, ->
-    saveObjectToStorage(CURRENT_USER_KEY, null)
+    storage.save(CURRENT_USER_KEY, null)
     window.location.reload()
   )
   res.fail(genericFailure)
@@ -38,7 +38,7 @@ init = ->
   # Load the user from local storage, and refresh it from the server.
   # Also refresh and cache the gravatar info.
 
-  storedUser = loadObjectFromStorage(CURRENT_USER_KEY)
+  storedUser = storage.load(CURRENT_USER_KEY)
   firstTime = not storedUser
   module.exports.me = window.me = new User(storedUser)
   me.url = -> '/auth/whoami'
@@ -50,14 +50,14 @@ init = ->
       # Assign testGroupNumber to returning visitors; new ones in server/handlers/user
       me.set 'testGroupNumber', Math.floor(Math.random() * 256)
       me.save()
-    saveObjectToStorage(CURRENT_USER_KEY, me.attributes)
+    storage.save(CURRENT_USER_KEY, me.attributes)
 
   me.loadGravatarProfile() if me.get('email')
   me.on('sync', userSynced)
 
 userSynced = (user) ->
   Backbone.Mediator.publish('me:synced', {me:user})
-  saveObjectToStorage(CURRENT_USER_KEY, user)
+  storage.save(CURRENT_USER_KEY, user)
 
 init()
 
@@ -71,7 +71,7 @@ Backbone.Mediator.subscribe('level-set-volume', onSetVolume, module.exports)
 trackFirstArrival = ->
   # will have to filter out users who log in with existing accounts separately
   # but can at least not track logouts as first arrivals using local storage
-  beenHereBefore = loadObjectFromStorage(BEEN_HERE_BEFORE_KEY)
+  beenHereBefore = storage.load(BEEN_HERE_BEFORE_KEY)
   return if beenHereBefore
   window.tracker?.trackEvent 'First Arrived'
-  saveObjectToStorage(BEEN_HERE_BEFORE_KEY, true)
+  storage.save(BEEN_HERE_BEFORE_KEY, true)

app/lib/forms.coffee

@@ -23,16 +23,15 @@ module.exports.applyErrorsToForm = (el, errors) ->
       prop = error.property
       
     input = $("[name='#{prop}']", el)
-    if not input[0]
+    if not input.length
       missingErrors.push(error)
       continue
-    controls = input.closest('.controls')
-    controls.append($("<span class='help-inline error-inline'>#{message}</span>"))
-    group = controls.closest('.control-group')
-    group.addClass('error')
+    formGroup = input.closest('.form-group')
+    formGroup.addClass 'has-error'
+    formGroup.append($("<span class='help-block error-help-block'>#{message}</span>"))
   return missingErrors
 
 module.exports.clearFormAlerts = (el) ->
-  $('.error', el).removeClass('error')
-  $('.error-inline', el).remove()
-  $('.alert', el).remove()
+  $('.has-error', el).removeClass('has-error')
+  $('.alert', el).remove()
+  el.find('.help-block.error-help-block').remove()

app/lib/sprites/SpriteBuilder.coffee

@@ -13,7 +13,9 @@ module.exports = class SpriteBuilder
 
   buildMovieClip: (animationName, movieClipArgs...) ->
     animData = @animationStore[animationName]
-    console.log "couldn't find animData from", @animationStore, "for", animationName unless animData
+    unless animData
+      console.error "couldn't find animData from", @animationStore, "for", animationName
+      return null
     locals = {}
     _.extend locals, @buildMovieClipShapes(animData.shapes)
     _.extend locals, @buildMovieClipContainers(animData.containers)

app/lib/storage.coffee

@@ -1,4 +1,4 @@
-module.exports.loadObjectFromStorage = (key) ->
+module.exports.load = (key) ->
   s = localStorage.getItem(key)
   return null unless s
   try
@@ -8,6 +8,8 @@ module.exports.loadObjectFromStorage = (key) ->
     console.warning('error loading from storage', key)
     return null
 
-module.exports.saveObjectToStorage = (key, value) ->
+module.exports.save = (key, value) ->
   s = JSON.stringify(value)
-  localStorage.setItem(key, s)
+  localStorage.setItem(key, s)
+  
+module.exports.remove = (key) -> localStorage.removeItem key

app/lib/surface/Camera.coffee

@@ -186,6 +186,7 @@ module.exports = class Camera extends CocoClass
     # Target is either just a {x, y} pos or a display object with {x, y} that might change; surface coordinates.
     time = 0 if @instant
     newTarget ?= {x:0, y:0}
+    newTarget = (@newTarget or @target) if @locked 
     newZoom = Math.min((Math.max @minZoom, newZoom), MAX_ZOOM)
     return if @zoom is newZoom and newTarget is newTarget.x and newTarget.y is newTarget.y
 
@@ -218,7 +219,7 @@ module.exports = class Camera extends CocoClass
 
   updateZoom: (force=false) ->
     # Update when we're focusing on a Thang, tweening, or forcing it, unless we're locked
-    return if @locked or (not force and not @newTarget and not @target?.name)
+    return if (not force) and (@locked or (not @newTarget and not @target?.name))
     if @newTarget
       t = @tweenProgress
       @zoom = @oldZoom + t * (@newZoom - @oldZoom)

app/lib/surface/CocoSprite.coffee

@@ -54,16 +54,26 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     'surface:ticked': 'onSurfaceTicked'
 
   constructor: (@thangType, options) ->
-    super()    
+    super()
     @options = _.extend(_.cloneDeep(@options), options)
     @setThang @options.thang
     console.error @toString(), "has no ThangType!" unless @thangType
     @actionQueue = []
     @marks = {}
     @labels = {}
+    @age = 0
+    @displayObject = new createjs.Container()
+    if @thangType.get('actions')
+      @onThangTypeLoaded()
+    else
+      @stillLoading = true
+      @thangType.fetch()
+      @thangType.once 'sync', @onThangTypeLoaded, @
+
+  onThangTypeLoaded: ->
+    @stillLoading = false
     @actions = @thangType.getActions()
     @buildFromSpriteSheet @buildSpriteSheet()
-    @ticker = 0
 
   destroy: ->
     super()
@@ -73,7 +83,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
   toString: -> "<CocoSprite: #{@thang?.id}>"
 
   buildSpriteSheet: ->
-    options = @thang?.getSpriteOptions() or {}
+    options = @thang?.getSpriteOptions?() or {}
     options.colorConfig = @options.colorConfig if @options.colorConfig
     options.async = false
     @thangType.getSpriteSheet options
@@ -85,9 +95,8 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
       sprite = new createjs.Shape()
     sprite.scaleX = sprite.scaleY = 1 / @options.resolutionFactor
     # temp, until these are re-exported with perspective
-    if @options.camera and @thangType.get('name') in ['Dungeon Floor', 'Grass', 'Goal Trigger', 'Obstacle']  
+    if @options.camera and @thangType.get('name') in ['Dungeon Floor', 'Indoor Floor', 'Grass', 'Goal Trigger', 'Obstacle']
       sprite.scaleY *= @options.camera.y2x
-    @displayObject = new createjs.Container()
     @imageObject = sprite
     @displayObject.addChild(sprite)
     @addHealthBar()
@@ -115,7 +124,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @playNextAction()
 
   onActionEnd: (e) => @playNextAction()
-  onSurfaceTicked: -> @ticker += 1
+  onSurfaceTicked: (e) -> @age += e.dt
 
   playNextAction: ->
     @playAction(@actionQueue.splice(0,1)[0]) if @actionQueue.length
@@ -135,6 +144,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
 
   update: ->
     # Gets the sprite to reflect what the current state of the thangs and surface are
+    return if @stillLoading
     @updatePosition()
     @updateScale()
     @updateAlpha()
@@ -149,16 +159,21 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @displayObject.cache 0, 0, bounds.width, bounds.height
     #console.log "just cached", @thang.id, "which was at", @imageObject.x, @imageObject.y, bounds.width, bounds.height, "with scale", Math.max(@imageObject.scaleX, @imageObject.scaleY)
 
+  getBobOffset: ->
+    return 0 unless @thang.bobHeight
+    @thang.bobHeight * (1 + Math.sin(@age * Math.PI / @thang.bobTime))
+
   updatePosition: ->
     return unless @thang?.pos and @options.camera?
-    if @thang.bobHeight                        
-      @thang.pos.z = @thang.pos.z + (Math.sin @ticker /  @thang.bobTime) * 0.1 * @thang.bobHeight
     [p0, p1] = [@lastPos, @thang.pos]
+    if bobOffset = @getBobOffset()
+      p1 = p1.copy?() or _.clone(p1)
+      p1.z += bobOffset
     return if p0 and p0.x is p1.x and p0.y is p1.y and p0.z is p1.z and not @options.camera.tweeningZoomTo
     wop = x: p1.x, y: p1.y, z: if @thang.isLand then 0 else p1.z - @thang.depth / 2
     sup = @options.camera.worldToSurface wop
     [@displayObject.x, @displayObject.y] = [sup.x, sup.y]
-    @lastPos = _.clone(p1)
+    @lastPos = p1.copy?() or _.clone(p1)
     @hasMoved = true
 
   updateScale: ->
@@ -197,19 +212,10 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     rotation
 
   updateIsometricRotation: (rotation, imageObject) ->
-    action = @currentRootAction
-    return unless action
-#    @flipOccasionally() if action.name is 'idle'
-    imageObject ?= @imageObject
-    imageObject.scaleX *= -1 if imageObject.scaleX < 0 # normalize to point right
-    imageObject.scaleX *= -1 if Math.abs(rotation) >= 135
-#    imageObject.scaleX *= -1 if @flipped and action.name is 'idle'
-
-  flipOccasionally: ->
-    @flippedCount += 1
-    return unless _.random(0,1000) <= 15 and @flippedCount > 30
-    @flipped = not @flipped
-    @flippedCount = 0
+    return unless @currentAction
+    return if _.string.endsWith(@currentAction.name, 'back')
+    return if _.string.endsWith(@currentAction.name, 'fore')
+    @imageObject.scaleX *= -1 if Math.abs(rotation) >= 90
 
   ##################################################
   updateAction: ->
@@ -429,4 +435,4 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     name = AudioPlayer.nameForSoundReference sound
     instance = createjs.Sound.play name, "none", delay, 0, 0, volume
 #    console.log @thang?.id, "played sound", name, "with delay", delay, "volume", volume, "and got sound instance", instance
-    instance
+    instance

app/lib/surface/IndieSprite.coffee

@@ -21,7 +21,7 @@ module.exports = IndieSprite = class IndieSprite extends CocoSprite
     thang.exists = true
     thang.width = thang.height = thang.depth = 4
     thang.pos = pos ? @defaultPos()
-    thang.pos.z ?= @defaultPos().z
+    thang.pos.z = thang.depth / 2
     thang.rotation = 0
     thang.action = 'idle'
     thang.setAction = (action) -> thang.action = action

app/lib/surface/Mark.coffee

@@ -137,10 +137,10 @@ module.exports = class Mark extends CocoClass
     if @name in ['shadow', 'debug']
       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
+        worldZ = @sprite.thang.pos.z - @sprite.thang.depth / 2 + @sprite.getBobOffset()
         @mark.alpha = 0.451 / Math.sqrt(worldZ / 2 + 1)
     else
-      pos ?= @sprite.displayObject
+      pos ?= @sprite?.displayObject
     @mark.x = pos.x
     @mark.y = pos.y
     if @name is 'highlight'
@@ -166,7 +166,7 @@ module.exports = class Mark extends CocoClass
       size += 60 if @name is 'selection'
       size += 60 if @name is 'repair'
       scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name]
-      if @sprite?.thang.spriteName.search(/dungeon.wall/i) isnt -1
+      if @sprite?.thang.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
         scale *= 2
     @mark.scaleX = @mark.scaleY = Math.min 1, scale
     if @name in ['selection', 'target', 'repair']

app/lib/surface/SpriteBoss.coffee

@@ -76,7 +76,7 @@ module.exports = class SpriteBoss extends CocoClass
     id ?= sprite.thang.id
     console.error "Sprite collision! Already have:", id if @sprites[id]
     @sprites[id] = sprite
-    layer ?= @spriteLayers["Obstacle"] if sprite.thang?.spriteName.search(/dungeon.wall/i) isnt -1
+    layer ?= @spriteLayers["Obstacle"] if sprite.thang?.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
     layer ?= @layerForChild sprite.displayObject, sprite
     layer.addChild sprite.displayObject
     layer.updateLayerOrder()
@@ -163,7 +163,8 @@ module.exports = class SpriteBoss extends CocoClass
       if sprite = @sprites[thang.id]
         sprite.setThang thang  # make sure Sprite has latest Thang
       else
-        sprite = @addThangToSprites(thang) or updateOrder
+        sprite = @addThangToSprites(thang)
+        Backbone.Mediator.publish 'surface:new-thang-added', thang:thang, sprite:sprite
         updateCache = updateCache or sprite.displayObject.parent is @spriteLayers["Obstacle"]
         sprite.playSounds()
     for thangID, sprite of @sprites
@@ -176,7 +177,7 @@ module.exports = class SpriteBoss extends CocoClass
 
   cache: (update=false) ->
     return if @cached and not update
-    wallSprites = (sprite for thangID, sprite of @sprites when sprite.thangType?.get('name') is 'Dungeon Wall')
+    wallSprites = (sprite for thangID, sprite of @sprites when sprite.thangType?.get('name').search(/(dungeon|indoor).wall/i) isnt -1)
     walls = (sprite.thang for sprite in wallSprites)
     @world.calculateBounds()
     wallGrid = new Grid walls, @world.size()...
@@ -230,7 +231,7 @@ module.exports = class SpriteBoss extends CocoClass
       @selectedSprite = sprite
     alive = sprite?.thang.health > 0
 
-    Backbone.Mediator.publish "surface:sprite-selected",
+    Backbone.Mediator.publish 'surface:sprite-selected',
       thang: if sprite then sprite.thang else null
       sprite: sprite
       spellName: spellName ? e?.spellName
@@ -259,6 +260,6 @@ module.exports = class SpriteBoss extends CocoClass
     target = thang?.target
     targetPos = thang?.targetPos
     targetPos = null if targetPos?.isZero?()  # Null targetPos get serialized as (0, 0, 0)
-    @targetMark.toggle target or targetPos
     @targetMark.setSprite if target then @sprites[target.id] else null
+    @targetMark.toggle @targetMark.sprite or targetPos
     @targetMark.update if targetPos then @camera.worldToSurface targetPos else null

app/lib/surface/Surface.coffee

@@ -55,6 +55,7 @@ module.exports = Surface = class Surface extends CocoClass
     'level-toggle-debug': 'onToggleDebug'
     'level-set-grid': 'onSetGrid'
     'level-toggle-grid': 'onToggleGrid'
+    'level-toggle-pathfinding': 'onTogglePathFinding'
     'level-set-time': 'onSetTime'
     'level-set-surface-camera': 'onSetCamera'
     'level:restarted': 'onLevelRestarted'
@@ -63,8 +64,9 @@ module.exports = Surface = class Surface extends CocoClass
     'level-set-letterbox': 'onSetLetterbox'
 
   shortcuts:
-    '\\': 'onToggleDebug'
-    'g': 'onToggleGrid'
+    'ctrl+\\, ⌘+\\': 'onToggleDebug'
+    'ctrl+g, ⌘+g': 'onToggleGrid'
+    'ctrl+o, ⌘+o': 'onTogglePathFinding'
 
   # external functions
 
@@ -101,6 +103,65 @@ module.exports = Surface = class Surface extends CocoClass
     @onFrameChanged()
     Backbone.Mediator.publish 'surface:world-set-up'
 
+  onTogglePathFinding: (e) ->
+    e?.preventDefault?()
+    @hidePathFinding()
+    @showingPathFinding = not @showingPathFinding
+    if @showingPathFinding then @showPathFinding() else @hidePathFinding()
+
+  hidePathFinding: ->
+    @surfaceLayer.removeChild @navRectangles if @navRectangles
+    @surfaceLayer.removeChild @navPaths if @navPaths
+    @navRectangles = @navPaths = null
+
+  showPathFinding: ->
+    @hidePathFinding()
+
+    mesh = _.values(@world.navMeshes or {})[0]
+    return unless mesh
+    @navRectangles = new createjs.Container()
+    @navRectangles.layerPriority = -1
+    @addMeshRectanglesToContainer mesh, @navRectangles
+    @surfaceLayer.addChild @navRectangles
+    @surfaceLayer.updateLayerOrder()
+
+    graph = _.values(@world.graphs or {})[0]
+    return @surfaceLayer.updateLayerOrder() unless graph
+    @navPaths = new createjs.Container()
+    @navPaths.layerPriority = -1
+    @addNavPathsToContainer graph, @navPaths
+    @surfaceLayer.addChild @navPaths
+    @surfaceLayer.updateLayerOrder()
+
+  addMeshRectanglesToContainer: (mesh, container) ->
+    for rect in mesh
+      shape = new createjs.Shape()
+      pos = @camera.worldToSurface {x:rect.x, y:rect.y}
+      dim = @camera.worldToSurface {x:rect.width, y:rect.height}
+      shape.graphics
+        .setStrokeStyle(3)
+        .beginFill('rgba(0, 0, 128, 0.3)')
+        .beginStroke('rgba(0, 0, 128, 0.7)')
+        .drawRect(pos.x - dim.x/2, pos.y - dim.y/2, dim.x, dim.y)
+      container.addChild shape
+
+  addNavPathsToContainer: (graph, container) ->
+    for node in _.values graph
+      for edgeVertex in node.edges
+        @drawLine node.vertex, edgeVertex, container
+
+  drawLine: (v1, v2, container) ->
+    shape = new createjs.Shape()
+    v1 = @camera.worldToSurface v1
+    v2 = @camera.worldToSurface v2
+    shape.graphics
+      .setStrokeStyle(1)
+      .moveTo(v1.x, v1.y)
+      .beginStroke('rgba(128, 0, 0, 0.4)')
+      .lineTo(v2.x, v2.y)
+      .endStroke()
+    container.addChild shape
+
   setProgress: (progress, scrubDuration=500) ->
     progress = Math.max(Math.min(progress, 0.99), 0.0)
 
@@ -338,14 +399,15 @@ module.exports = Surface = class Surface extends CocoClass
   gridShowing: ->
     @gridLayer?.parent?
 
-  onToggleGrid: ->
+  onToggleGrid: (e) ->
+    e?.preventDefault?()
     if @gridShowing() then @hideGrid() else @showGrid()
 
   onSetGrid: (e) ->
     if e.grid then @showGrid() else @hideGrid()
 
   onToggleDebug: (e) ->
-    e?.preventDefault()
+    e?.preventDefault?()
     Backbone.Mediator.publish 'level-set-debug', {debug: not @debug}
 
   onSetDebug: (e) ->
@@ -396,7 +458,7 @@ module.exports = Surface = class Surface extends CocoClass
     @drawCurrentFrame()
     @onFrameChanged()
     @updatePaths() if (@totalFramesDrawn % 2) is 0 or createjs.Ticker.getMeasuredFPS() > createjs.Ticker.getFPS() - 5
-    Backbone.Mediator.publish('surface:ticked', {})
+    Backbone.Mediator.publish('surface:ticked', {dt: @world.dt})
     mib = @stage.mouseInBounds
     if @mouseInBounds isnt mib
       Backbone.Mediator.publish('surface:mouse-' + (if mib then "over" else "out"), {})

app/lib/surface/WizardSprite.coffee

@@ -3,8 +3,6 @@ Camera = require './Camera'
 {me} = require 'lib/auth'
 
 module.exports = class WizardSprite extends IndieSprite
-  ticker: 0
-
   # Wizard targets are constantly changing, so a simple tween doesn't work.
   # Instead, the wizard stores its origin point and the (possibly) moving target.
   # Then it figures out its current position based on tween percentage and
@@ -16,12 +14,11 @@ module.exports = class WizardSprite extends IndieSprite
   reachedTarget: true
   spriteXOffset: 4  # meters from target sprite
   spriteYOffset: 0  # meters from target sprite
-  spriteZOffset: 1  # meters from ground (in middle of float)
 
   subscriptions:
     'bus:player-states-changed': 'onPlayerStatesChanged'
     'me:synced': 'onMeSynced'
-    'surface:sprite-selected': 'onSpriteSelected'    
+    'surface:sprite-selected': 'onSpriteSelected'
     'echo-self-wizard-sprite': 'onEchoSelfWizardSprite'
     'echo-all-wizard-sprites': 'onEchoAllWizardSprites'
 
@@ -38,6 +35,9 @@ module.exports = class WizardSprite extends IndieSprite
   makeIndieThang: (thangType, thangID, pos) ->
     thang = super thangType, thangID, pos
     thang.isSelectable = false
+    thang.bobHeight = 1.5
+    thang.bobTime = 2
+    thang.pos.z += thang.bobHeight
     thang
 
   onPlayerStatesChanged: (e) ->
@@ -73,18 +73,8 @@ module.exports = class WizardSprite extends IndieSprite
       .to({scaleX: 0, scaleY: 0, alpha: 0}, 1000, createjs.Ease.getPowInOut(2.2))
     tween.call(callback) if callback
 
-  # We need the generalizable tinting system included in spritesheet making
-  #updateColorFilters: ->
-  #  return if @colorHue is undefined
-  #  rgb = hslToRgb(@colorHue, 1.0, 0.75)
-  #  rgb = (parseInt(val) / 256 for val in rgb)
-  #  rgb = rgb.concat([1, 0, 0, 0, 0])
-  #  filter = new createjs.ColorFilter(rgb...)
-  #  dob = @imageObject
-  #  dob.filters = [filter]
-  #  dob.cache(0, 0, @data.width, @data.height, Math.abs(dob.scaleX*2))
-
   setColorHue: (newColorHue) ->
+    # TODO: is this needed any more?
     return if @colorHue is newColorHue
     @colorHue = newColorHue
     #@updateColorFilters()
@@ -102,8 +92,7 @@ module.exports = class WizardSprite extends IndieSprite
 
   onEchoSelfWizardSprite: (e) -> e.payload = @ if @isSelf
   onEchoAllWizardSprites: (e) -> e.payload.push @
-  defaultPos: -> x: 35, y: 24, z: @thang.depth / 2 + @spriteZOffset
-  getZOffset: -> @thang.depth / 2 + @spriteZOffset + Math.sin @ticker / 20  # Cloud bobbing.  
+  defaultPos: -> x: 35, y: 24, z: @thang.depth / 2 + @thang.bobHeight
   move: (pos, duration) -> @setTarget(pos, duration)
 
   setTarget: (newTarget, duration) ->
@@ -196,7 +185,7 @@ module.exports = class WizardSprite extends IndieSprite
     """
     @targetPos = @targetSprite.thang.pos if @targetSprite
     pos = _.clone(@targetPos)
-    pos.z = @getZOffset()
+    pos.z = @defaultPos().z + @getBobOffset()
     @adjustPositionToSideOfTarget(pos) if @targetSprite  # be off to the side depending on placement in world
     return pos if @reachedTarget  # stick like glue
 
@@ -227,10 +216,5 @@ module.exports = class WizardSprite extends IndieSprite
     if @targetSprite
       @pointToward(@targetSprite.thang.pos)
 
-  updateIsometricRotation: (rotation, imageObject) ->
-    super rotation, imageObject
-    imageObject ?= @imageObject
-    imageObject.scaleX *= -1 if Math.abs(rotation) <= 45 or Math.abs(rotation) >= 135  # reverse it
-
   updateMarks: ->
     super() if @displayObject.visible  # not if we hid the wiz

app/lib/world/names.coffee

@@ -1,5 +1,5 @@
 module.exports.thangNames = thangNames =
-  "Soldier": [
+  "Soldier M": [
     "William"
     "Lucas"
     "Marcus"
@@ -45,16 +45,18 @@ module.exports.thangNames = thangNames =
     "Sterling"
     "Alistair"
     "Remy"
-    "Lana"
     "Stormy"
     "Halle"
+    "Sage"
+  ]
+  "Soldier F": [
     "Sarah"
     "Alexandra"
     "Holly"
     "Trinity"
     "Nikita"
     "Alana"
-    "Sage"
+    "Lana"
   ]
   "Peasant": [
     "Yorik"
@@ -77,7 +79,7 @@ module.exports.thangNames = thangNames =
     "Bernadette"
     "Hershell"
   ]
-  "Archer": [
+  "Archer F": [
     "Phoebe"
     "Mira"
     "Agapi"
@@ -98,13 +100,15 @@ module.exports.thangNames = thangNames =
     "Clare"
     "Rowan"
     "Omar"
-    "Brian"
-    "Cole"
     "Alden"
     "Cairn"
     "Jensen"
   ]
-  "Ogre Munchkin": [
+  "Archer M": [
+    "Brian"
+    "Cole"
+  ]
+  "Ogre Munchkin M": [
     "Brack"
     "Gort"
     "Weeb"
@@ -120,15 +124,17 @@ module.exports.thangNames = thangNames =
     "Skoggen"
     "Treg"
     "Goreball"
-    "Shmeal"
     "Gert"
     "Thabt"
-    "Iyert"
-    "Palt"
     "Snortt"
     "Kog"
   ]
-  "Ogre": [
+  "Ogre Munchkin F": [
+    "Iyert"
+    "Palt"
+    "Shmeal"
+  ]
+  "Ogre M": [
     "Krogg"
     "Dronck"
     "Trogdor"
@@ -137,6 +143,8 @@ module.exports.thangNames = thangNames =
     "Mak Fod"
     "Trung"
     "Axe Ox"
+  ]
+  "Ogre F": [
     "Nareng"
     "Morthrug"
     "Glonc"

app/lib/world/rand.coffee

@@ -32,8 +32,4 @@ class Rand
   rand2: (min, max) =>
     min + @rand max - min
 
-  # return an array of numbers from 0 to n-1, shuffled
-  randArray: (n) =>
-    _.shuffle [0...n]
-
 module.exports = Rand

app/lib/world/rectangle.coffee

@@ -8,6 +8,8 @@ class Rectangle
       Rectangle[name] = (a, b) ->
         a.copy()[name](b)
 
+  apiProperties: ['x', 'y', 'width', 'height', 'rotation', 'getPos', 'vertices', 'touchesRect', 'touchesPoint', 'distanceToPoint', 'containsPoint', 'copy']
+
   constructor: (@x=0, @y=0, @width=0, @height=0, @rotation=0) ->
 
   copy: ->
@@ -68,6 +70,7 @@ class Rectangle
 
   distanceSquaredToPoint: (p) ->
     # Doesn't handle rotation; just supposed to be faster than distanceToPoint
+    p = Vector.subtract(p, @getPos())
     dx = Math.max(Math.abs(p.x) - @width / 2, 0)
     dy = Math.max(Math.abs(p.y) - @height / 2, 0)
     dx * dx + dy * dy
@@ -113,4 +116,7 @@ class Rectangle
   @deserialize: (o, world, classMap) ->
     new Rectangle o.x, o.y, o.w, o.h, o.r
 
+  serializeForAether: -> @serialize()
+  @deserializeFromAether: (o) -> @deserialize o
+
 module.exports = Rectangle

app/lib/world/script_event_prereqs.coffee

@@ -10,7 +10,9 @@ module.exports.scriptMatchesEventPrereqs = scriptMatchesEventPrereqs = (script,
     return false if ap.greaterThanOrEqualTo? and not (v >= ap.greaterThanOrEqualTo)
     return false if ap.lessThan? and not (v < ap.lessThan)
     return false if ap.lessThanOrEqualTo? and not (v <= ap.lessThanOrEqualTo)
-    return false if ap.containingString? and v?.search(ap.containingString) == -1
-    return false if ap.notContainingString? and v?.search(ap.containingString) != -1
+    return false if ap.containingString? and (not v or v.search(ap.containingString) is -1)
+    return false if ap.notContainingString? and v?.search(ap.notContainingString) isnt -1
+    return false if ap.containingRegexp? and (not v or v.search(new RegExp(ap.containingRegexp)) is -1)
+    return false if ap.notContainingRegexp? and v?.search(new RegExp(ap.notContainingRegexp)) isnt -1
 
   return true

app/lib/world/thang.coffee

@@ -4,44 +4,31 @@ ThangState = require './thang_state'
 Rand = require './rand'
 
 module.exports = class Thang
-  @className: "Thang"
-  @random = new Rand
+  @className: 'Thang'
+  @remainingThangNames: {}
 
-  # Random ordering for each sprite name
-  @ordering: (spriteName) ->
-    Thang.orders ?= {}
-    names = thangNames[spriteName]
-    if names
-      len = names.length
-      array = Thang.orders[spriteName]
-      unless array?
-        array = @random.randArray len
-        Thang.orders[spriteName] = array
-    else
-      array = []
-    array
-
-  @nextID: (spriteName) ->
+  @nextID: (spriteName, world) ->
     Thang.lastIDNums ?= {}
-    names = thangNames[spriteName]
-    order = @ordering spriteName
-    if names
-      lastIDNum = Thang.lastIDNums[spriteName]
-      idNum = (if lastIDNum? then lastIDNum + 1 else 0)
-      Thang.lastIDNums[spriteName] = idNum
-      id = names[order[idNum % names.length]]
-      if idNum >= names.length
-        id += Math.floor(idNum / names.length) + 1
-    else
-      Thang.lastIDNums[spriteName] = if Thang.lastIDNums[spriteName]? then Thang.lastIDNums[spriteName] + 1 else 0
-      id = spriteName + (Thang.lastIDNums[spriteName] or '')
-    id
+    originals = thangNames[spriteName] or [spriteName]
+    remaining = Thang.remainingThangNames[spriteName]
+    remaining = Thang.remainingThangNames[spriteName] = originals.slice() unless remaining?.length
 
-  @resetThangIDs: -> Thang.lastIDNums = {}
+    baseName = remaining.splice(world.rand.rand(remaining.length), 1)[0]
+    i = 0
+    while true
+      name = if i then "#{baseName} #{i}" else baseName
+      extantThang = world.thangMap[name]
+      break unless extantThang
+      i++
+    name
+
+  @resetThangIDs: -> Thang.remainingThangNames = {}
+
+  apiProperties: ['id', 'spriteName', 'health', 'pos', 'team']
 
   constructor: (@world, @spriteName, @id) ->
     @spriteName ?= @constructor.className
-    @id ?= @constructor.nextID @spriteName
+    @id ?= @constructor.nextID @spriteName, @world
     @addTrackedProperties ['exists', 'boolean']  # TODO: move into Systems/Components, too?
     #console.log "Generated #{@toString()}."
 
@@ -158,6 +145,9 @@ module.exports = class Thang
       t[prop] = val
     t
 
+  serializeForAether: ->
+    {CN: @constructor.className, id: @id}
+
   getSpriteOptions: ->
     colorConfigs = @world?.getTeamColors() or {}
     options = {}

app/lib/world/vector.coffee

@@ -8,6 +8,7 @@ class Vector
         a.copy()[name](b, useZ)
 
   isVector: true
+  apiProperties: ['x', 'y', 'magnitude', 'heading', 'distance', 'dot', 'equals', 'copy']
 
   constructor: (@x=0, @y=0, @z=0) ->
 
@@ -119,4 +120,7 @@ class Vector
   @deserialize: (o, world, classMap) ->
     new Vector o.x, o.y, o.z
 
+  serializeForAether: -> @serialize()
+  @deserializeFromAether: (o) -> @deserialize o
+
 module.exports = Vector

app/lib/world/world.coffee

@@ -14,6 +14,9 @@ DESERIALIZATION_INTERVAL = 20
 
 module.exports = class World
   @className: "World"
+  age: 0
+  ended: false
+  apiProperties: ['age', 'dt']
   constructor: (name, @userCodeMap, classMap) ->
     # classMap is needed for deserializing Worlds, Thangs, and other classes
     @classMap = classMap ? {Vector: Vector, Rectangle: Rectangle, Thang: Thang}
@@ -28,8 +31,6 @@ module.exports = class World
     @scriptNotes = []
     @rand = new Rand 0
     @frames = [new WorldFrame(@, 0)]
-  age: 0
-  ended: false
 
   # --- This config needs to move into Systems config --- TODO
   playableTeams: ["humans"]
@@ -221,7 +222,7 @@ module.exports = class World
     channel = 'world:' + channel
     for script in @scripts
       continue if script.channel isnt channel
-      scriptNote = new WorldScriptNote script, event, world
+      scriptNote = new WorldScriptNote script, event
       continue if scriptNote.invalid
       @scriptNotes.push scriptNote
     return unless @goalManager

app/lib/world/world_frame.coffee

@@ -38,11 +38,11 @@ module.exports = class WorldFrame
     map = ((' ' for x in [0 .. @world.width])  \
            for y in [0 .. @world.height])
     symbols = ".ox@dfga[]/D"
-    for thang, i in @thangs
+    for thang, i in @world.thangs when thang.rectangle
       rect = thang.rectangle().axisAlignedBoundingBox()
       for y in [Math.floor(rect.y - rect.height / 2) ... Math.ceil(rect.y + rect.height / 2)]
         for x in [Math.floor(rect.x - rect.width / 2) ... Math.ceil(rect.x + rect.width / 2)]
-          map[y][x] = symbols[i]
+          map[y][x] = symbols[i % symbols.length] if 0 <= y < @world.height and 0 <= x < @world.width
     @time + "\n" + (xs.join(' ') for xs in map).join('\n') + '\n'
 
   serialize: (frameIndex, trackedPropertiesThangIDs, trackedPropertiesPerThangIndices, trackedPropertiesPerThangTypes, trackedPropertiesPerThangValues, specialValuesToKeys, specialKeysToValues) ->

app/locale/ar.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
+#    sign_up: "Create An Account"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/bg.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "български език", englishDescri
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    fork: "Fork"
+#    play: "Play"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "български език", englishDescri
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "български език", englishDescri
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "български език", englishDescri
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "български език", englishDescri
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "български език", englishDescri
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/cs.coffee

@@ -1,463 +1,440 @@
 module.exports = nativeDescription: "čeština", englishDescription: "Czech", translation:
   common:
-    loading: "Loading..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    loading: "Načítání..."
+    saving: "Ukládání..."
+    sending: "Odesílání..."
+    cancel: "Zrušit"
+    save: "Uložit"
+    delay_1_sec: "1 vteřina"
+    delay_3_sec: "3 vteřiny"
+    delay_5_sec: "5 vteřin"
+    manual: "Ručně"
+    fork: "Klonovat"
+    play: "Přehrát"
 
-#  modal:
-#    close: "Close"
-#    okay: "Okay"
+  modal:
+    close: "Zavřít"
+    okay: "Budiž"
 
-#  not_found:
-#    page_not_found: "Page not found"
+  not_found:
+    page_not_found: "Stránka nenalezena"
 
-#  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
-#    play: "Levels"
-#    editor: "Editor"
-#    blog: "Blog"
-#    forum: "Forum"
-#    admin: "Admin"
-#    home: "Home"
-#    contribute: "Contribute"
-#    legal: "Legal"
-#    about: "About"
-#    contact: "Contact"
-#    twitter_follow: "Follow"
-#    employers: "Employers"
+  nav:
+    play: "Úrovně"
+    editor: "Editor"
+    blog: "Blog"
+    forum: "Fórum"
+    admin: "Admin"
+    home: "Domů"
+    contribute: "Přispívat"
+    legal: "Licence"
+    about: "O programu"
+    contact: "Kontakt"
+    twitter_follow: "Sledovat na twitteru"
+    employers: "Pro zaměstnavatele"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
+  versions:
+    save_version_title: "Uložit novou Verzi"
+    new_major_version: "Nová hlavní Verze"
+    cla_prefix: "Před uložením musíte souhlasit s"
+    cla_url: "licencí"
+    cla_suffix: "."
+    cla_agree: "SOUHLASÍM"
 
-#  versions:
-#    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+  login:
+    sign_up: "Vytvořit účet"
+    log_in: "Přihlásit"
+    log_out: "Odhlásit"
+    recover: "obnovit účet"
 
-#  login:
-#    login_modal_title: "Log In"
-#    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
-#    recover: "recover account"
+  recover:
+    recover_account_title: "Obnovení účtu"
+    send_password: "Zaslat nové heslo"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  signup:
+    create_account_title: "Vytvořit účet k uložení úrovně"
+    description: "Registrace je zdarma. Vyplňte pouze několik údajů:"
+    email_announcements: "Dostávat novinky emailem"
+    coppa: "starší  13 let nebo nejste z USA "
+    coppa_why: "(Proč?)"
+    creating: "Vytvářím účet..."
+    sign_up: "Přihlášení"
+    log_in: "zadejte vaše heslo"
 
-#  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"
-#    or: "or "
-#    log_in: "log in with password"
+  home:
+    slogan: "Naučte se programování JavaScriptu 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"
 
-#  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"
+  play:
+    choose_your_level: "Zvolte si úroveň"
+    adventurer_prefix: "Můžete přejít do dalších úrovní, nebo debatovat o úrovních na "
+    adventurer_forum: "fóru Dobrodruhů"
+    adventurer_suffix: "."
+    campaign_beginner: "Začátečnická úroveň"
+    campaign_beginner_description: "...ve které se naučíte kouzla programování."
+    campaign_dev: "Náhodné težší úrovně"
+    campaign_dev_description: "...ve kterých se dozvíte více o prostředí při plnění těžších úkolů."
+    campaign_multiplayer: "Multiplayer Aréna"
+    campaign_multiplayer_description: "...ve které programujete proti jiným hráčům."
+    campaign_player_created: "Uživatelsky vytvořené úrovně"
+    campaign_player_created_description: "...ve kterých bojujete proti kreativitě ostatních <a href=\"/contribute#artisan\">Zdatných Kouzelníků</a>."
+    level_difficulty: "Obtížnost: "
 
-#  play:
-#    choose_your_level: "Choose Your Level"
-#    adventurer_prefix: "You can jump to any level below, or discuss the levels on "
-#    adventurer_forum: "the Adventurer forum"
-#    adventurer_suffix: "."
-#    campaign_beginner: "Beginner Campaign"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
-#    campaign_player_created: "Player-Created"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
-
-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
-#    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
-#    forum_suffix: " instead."
-#    sending: "Sending..."
-#    send: "Send Feedback"
+  contact:
+    contact_us: "Konktujte CodeCombat"
+    welcome: "Rádi od vás uslyšíme. Použijte tento formulář pro odeslání emailu. "
+    contribute_prefix: "Chcete-li nám přispět, prohlédněte si naši stránku "
+    contribute_page: "přispivatelů"
+    contribute_suffix: "!"
+    forum_prefix: "Pro ostatní veřejné věci, prosím zkuste "
+    forum_page: "naše fórum"
+    forum_suffix: "."
+    send: "Odeslat připomínku"
 
   diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Czech 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 Czech."
-    missing_translations: "Until we can translate everything into Czech, you'll see English when Czech isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    title: "Pomozte přeložit CodeCombat!"
+    sub_heading: "Potřebujeme vaše dovednosti."
+    pitch_body: "Přestože vyvíjíme CodeCombat v angličtině, máme spoustu hráčů z celého světa a mnozí z nich by si rádi zahráli česky, neboť anglicky neumí. Pokud anglicky umíte, přihlaste se prosím jako Diplomat a pomozte nám v překladu webu i jednotlivých úrovní."
+    missing_translations: "Dokud nebude vše přeloženo, bude se vám na zatím nepřeložených místech zobrazovat text anglicky."
+    learn_more: "Dozvědět se více o Diplomatech"
+    subscribe_as_diplomat: "Přihlásit se jako Diplomat"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
+  wizard_settings:
+    title: "Nastavení Kouzelníka"
+    customize_avatar: "Upravte vás Avatar"
 
-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
-#    me_tab: "Me"
-#    picture_tab: "Picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
-#    gravatar_select: "Select which Gravatar photo to use"
-#    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
-#    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
-#    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
-#    contributor_emails: "Contributor Class Emails"
-#    contribute_prefix: "We're looking for people to join our party! Check out the "
-#    contribute_page: "contribute page"
-#    contribute_suffix: " to find out more."
-#    email_toggle: "Toggle All"
-#    saving: "Saving..."
-#    error_saving: "Error Saving"
-#    saved: "Changes Saved"
-#    password_mismatch: "Password does not match."
+  account_settings:
+    title: "Nastavení účtu"
+    not_logged_in: "Přihlaste se, nebo vytvořte si účet pro uložení nastavení."
+    autosave: "Automatické ukládání změn"
+    me_tab: "O mne"
+    picture_tab: "Obrázek"
+    wizard_tab: "Kouzelník"
+    password_tab: "Heslo"
+    emails_tab: "Emaily"
+    gravatar_select: "Zvolte kterou Gravatar fotografii použít"
+    gravatar_add_photos: "Přidat náhledy a fotografie do Gravatar účtu pro zvolení obrázku"
+    gravatar_add_more_photos: "Přidat do vašeho Gravatar účtu další fotografie."
+    wizard_color: "Barva Kouzelníkova oblečení"
+    new_password: "Nové heslo"
+    new_password_verify: "Potvrdit"
+    email_subscriptions: "Doručovat emailem"
+    email_announcements: "Oznámení"
+    email_notifications_description: "Zasílat na váš účet opakovaná oznámení."
+    email_announcements_description: "Zasílat emaily o posledních novinkách a o postupu ve vývoji CodeCombat."
+    contributor_emails: "Emaily pro přispívatele"
+    contribute_prefix: "Hledáme další přispívatele! Čtěte prosím "
+    contribute_page: "stránku přispívatelům"
+    contribute_suffix: " pro více informací."
+    email_toggle: "Zvolit vše"
+    error_saving: "Chyba při ukládání"
+    saved: "Změny uloženy"
+    password_mismatch: "Hesla nesouhlasí."
 
-#  account_profile:
-#    edit_settings: "Edit Settings"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    profile: "Profile"
-#    user_not_found: "No user found. Check the URL?"
-#    gravatar_not_found_mine: "We couldn't find your profile associated with:"
-#    gravatar_not_found_email_suffix: "."
-#    gravatar_signup_prefix: "Sign up at "
-#    gravatar_signup_suffix: " to get set up!"
-#    gravatar_not_found_other: "Alas, there's no profile associated with this person's email address."
-#    gravatar_contact: "Contact"
-#    gravatar_websites: "Websites"
-#    gravatar_accounts: "As Seen On"
-#    gravatar_profile_link: "Full Gravatar Profile"
+  account_profile:
+    edit_settings: "Editovat Nastavení"
+    profile_for_prefix: "Profil pro "
+    profile_for_suffix: ""
+    profile: "Profil"
+    user_not_found: "Uživatel nenalezen. Zkontrolujte adresu URL?"
+    gravatar_not_found_mine: "Nenalezli jsme profil asociovaný s:"
+    gravatar_not_found_email_suffix: "."
+    gravatar_signup_prefix: "Přihlásit se "
+    gravatar_signup_suffix: " k nastavení!"
+    gravatar_not_found_other: "Bohužel, neexistuje profil asociovaný s touto emailovou adresou."
+    gravatar_contact: "Kontakt"
+    gravatar_websites: "Weby"
+    gravatar_accounts: "Jak zobrazeno na"
+    gravatar_profile_link: "Účet Gravatar"
 
-#  play_level:
-#    level_load_error: "Level could not be loaded."
-#    done: "Done"
-#    grid: "Grid"
-#    customize_wizard: "Customize Wizard"
-#    home: "Home"
-#    guide: "Guide"
-#    multiplayer: "Multiplayer"
-#    restart: "Restart"
-#    goals: "Goals"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
-#    reload_title: "Reload All Code?"
-#    reload_really: "Are you sure you want to reload this level back to the beginning?"
-#    reload_confirm: "Reload All"
-#    victory_title_prefix: ""
-#    victory_title_suffix: " Complete"
-#    victory_sign_up: "Sign Up to Save Progress"
-#    victory_sign_up_poke: "Want to save your code? Create a free account!"
-#    victory_rate_the_level: "Rate the level: "
-#    victory_play_next_level: "Play Next Level"
-#    victory_go_home: "Go Home"
-#    victory_review: "Tell us more!"
-#    victory_hour_of_code_done: "Are You Done?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code!"
-#    multiplayer_title: "Multiplayer Settings"
-#    multiplayer_link_description: "Give this link to anyone to have them join you."
-#    multiplayer_hint_label: "Hint:"
-#    multiplayer_hint: " Click the link to select all, then press ⌘-C or Ctrl-C to copy the link."
-#    multiplayer_coming_soon: "More multiplayer features to come!"
-#    guide_title: "Guide"
-#    tome_minion_spells: "Your Minions' Spells"
-#    tome_read_only_spells: "Read-Only Spells"
-#    tome_other_units: "Other Units"
-#    tome_cast_button_castable: "Cast"
-#    tome_cast_button_casting: "Casting"
-#    tome_cast_button_cast: "Spell Cast"
-#    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
-#    tome_select_spell: "Select a Spell"
-#    tome_select_a_thang: "Select Someone for "
-#    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+  play_level:
+    level_load_error: "Úroveň se nepodařilo otevřít."
+    done: "Hotovo"
+    grid: "Mřížka"
+    customize_wizard: "Upravit Kouzelníka"
+    home: "Domů"
+    guide: "Průvodce"
+    multiplayer: "Multiplayer"
+    restart: "Restartovat"
+    goals: "Cíl"
+    action_timeline: "Časová osa"
+    click_to_select: "Vyberte kliknutím."
+    reload_title: "Znovunačíst veškerý kód?"
+    reload_really: "Opravdu chcete resetovat tuto úroveň do počátečního stavu?"
+    reload_confirm: "Znovu načíst vše"
+    victory_title_prefix: ""
+    victory_title_suffix: " Hotovo"
+    victory_sign_up: "Přihlásit se pro uložení postupu"
+    victory_sign_up_poke: "Chcete uložit váš kód? Vytvořte si účet zdarma!"
+    victory_rate_the_level: "Ohodnoťte tuto úroveň: "
+    victory_play_next_level: "Hrát další úroveň"
+    victory_go_home: "Přejít domů"
+    victory_review: "Připomínky!"
+    victory_hour_of_code_done: "Skončili jste?"
+    victory_hour_of_code_done_yes: "Ano, pro dnešek jsem skončil!"
+    multiplayer_title: "Nastavení Multiplayeru"
+    multiplayer_link_description: "Sdílejte tento odkaz s lidmi, kteří se k vám mohou přidat ve hře."
+    multiplayer_hint_label: "Tip:"
+    multiplayer_hint: " Klikněte na odkaz pro jeho výběr, poté stiskněte ⌘-C nebo Ctrl-C pro kopírování odkazu."
+    multiplayer_coming_soon: "Další vlastnosti multiplayeru jsou na cestě!"
+    guide_title: "Průvodce"
+    tome_minion_spells: "Vaše oblíbená kouzla"
+    tome_read_only_spells: "Kouzla jen pro čtení"
+    tome_other_units: "Ostatní jednotky"
+    tome_cast_button_castable: "Spustit"
+    tome_cast_button_casting: "Spouštění"
+    tome_cast_button_cast: "Spustit Kouzlo"
+    tome_autocast_delay: "Prodleva Autospouštení"
+    tome_select_spell: "Zvolte Kouzlo"
+    tome_select_a_thang: "Zvolte někoho pro "
+    tome_available_spells: "Dostupná kouzla"
+    hud_continue: "Pokračovat (stiskněte shift-mezera)"
+    spell_saved: "Kouzlo uloženo"
 
-#  admin:
-#    av_title: "Admin Views"
-#    av_entities_sub_title: "Entities"
-#    av_entities_users_url: "Users"
-#    av_entities_active_instances_url: "Active Instances"
-#    av_other_sub_title: "Other"
-#    av_other_debug_base_url: "Base (for debugging base.jade)"
-#    u_title: "User List"
-#    lg_title: "Latest Games"
+  admin:
+    av_title: "Administrátorský pohled"
+    av_entities_sub_title: "Entity"
+    av_entities_users_url: "Uživatelé"
+    av_entities_active_instances_url: "Aktivní instance"
+    av_other_sub_title: "Ostatní"
+    av_other_debug_base_url: "Base (pro debugování base.jade)"
+    u_title: "Seznam uživatelů"
+    lg_title: "Poslední hry"
 
-#  editor:
-#    main_title: "CodeCombat Editors"
-#    main_description: "Build your own levels, campaigns, units and educational content. We provide all the tools you need!"
-#    article_title: "Article Editor"
-#    article_description: "Write articles that give players overviews of programming concepts which can be used across a variety of levels and campaigns."
-#    thang_title: "Thang Editor"
-#    thang_description: "Build units, defining their default logic, graphics and audio. Currently only supports importing Flash exported vector graphics."
-#    level_title: "Level Editor"
-#    level_description: "Includes the tools for scripting, uploading audio, and constructing custom logic to create all sorts of levels. Everything we use ourselves!"
-#    security_notice: "Many major features in these editors are not currently enabled by default. As we improve the security of these systems, they will be made generally available. If you'd like to use these features sooner, "
-#    contact_us: "contact us!"
-#    hipchat_prefix: "You can also find us in our"
-#    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
-#    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
-#    level_tab_thangs: "Thangs"
-#    level_tab_scripts: "Scripts"
-#    level_tab_settings: "Settings"
-#    level_tab_components: "Components"
-#    level_tab_systems: "Systems"
-#    level_tab_thangs_title: "Current Thangs"
-#    level_tab_thangs_conditions: "Starting Conditions"
-#    level_tab_thangs_add: "Add Thangs"
-#    level_settings_title: "Settings"
-#    level_component_tab_title: "Current Components"
-#    level_component_btn_new: "Create New Component"
-#    level_systems_tab_title: "Current Systems"
-#    level_systems_btn_new: "Create New System"
-#    level_systems_btn_add: "Add System"
-#    level_components_title: "Back to All Thangs"
-#    level_components_type: "Type"
-#    level_component_edit_title: "Edit Component"
-#    level_system_edit_title: "Edit System"
-#    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
-#    new_component_title: "Create New Component"
-#    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
+  editor:
+    main_title: "Editory CodeCombatu"
+    main_description: "Vytvořte vlastní úrovně, kampaně, jednotky a vzdělávací obsah. My vám poskytujeme všechny potřebné nástroje!"
+    article_title: "Editor článků"
+    article_description: "Napište články, které objasní hráčům koncepty programování využitelné v úrovních a kampaních."
+    thang_title: "Editor Thangů - objektů"
+    thang_description: "Vytvořte jednotky, definujte jejich logiku, vlastnosti, grafiku a zvuk. Momentálně jsou podporovány pouze importy vektorové grafiky exportované z Flashe."
+    level_title: "Editor úrovní"
+    level_description: "Zahrnuje pomůcky pro skriptování, nahrávání audia a tvorbu vlastní logiky pro vytvoření vlastních úrovní. Obsahuje vše, čeho využíváme k tvorbě úrovní my!"
+    security_notice: "Velké množství důležitých funkcí těchto editorů je standardně vypnuto. Jak postupem času vylepšujeme bezpečnost celého systému, jsou tyto funkce uvolňovány k veřejnému použití. Potřebujete-li některé funkce dříve, "
+    contact_us: "kontaktujte nás!"
+    hipchat_prefix: "Můžete nás také najít v naší"
+    hipchat_url: "HipChat diskusní místnosti."
+    level_some_options: "Volby?"
+    level_tab_thangs: "Thangy"
+    level_tab_scripts: "Skripty"
+    level_tab_settings: "Nastavení"
+    level_tab_components: "Komponenty"
+    level_tab_systems: "Systémy"
+    level_tab_thangs_title: "Současné Thangy"
+    level_tab_thangs_conditions: "Výchozí prostředí"
+    level_tab_thangs_add: "Přidat Thangy"
+    level_settings_title: "Nastavení"
+    level_component_tab_title: "Současné komponenty"
+    level_component_btn_new: "Vytvořit novou komponentu"
+    level_systems_tab_title: "Současné systémy"
+    level_systems_btn_new: "Vytvořit nový systém"
+    level_systems_btn_add: "Přidat systém"
+    level_components_title: "Zpět na všechny Thangy"
+    level_components_type: "Druh"
+    level_component_edit_title: "Editovat komponentu"
+    level_system_edit_title: "Editovat systém"
+    create_system_title: "Vytvořit nový systém"
+    new_component_title: "Vytvořit novou komponentu"
+    new_component_field_system: "Systém"
+  article:
+    edit_btn_preview: "Náhled"
+    edit_article_title: "Editovat článek"
 
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
+  general:
+    and: "a"
+    name: "Jméno"
+    body: "Tělo"
+    version: "Verze"
+    commit_msg: "Popisek ukládání"
+    version_history_for: "Verze historie pro: "
+    results: "Výsledky"
+    description: "Popis"
+    or: "nebo"
+    email: "Email"
+    message: "Zpráva"
 
-#  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
-#    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
-#    edit_article_title: "Edit Article"
+  about:
+    who_is_codecombat: "Kdo je CodeCombat?"
+    why_codecombat: "Proč CodeCombat?"
+    who_description_prefix: "společně přišli s projektem CodeCombat v roce 2013. V roce 2008 jsme vytvořili také "
+    who_description_suffix: ", jedničku mezi webovými a IOS aplikacemi pro učení psaní japonských a čínských znaků."
+    who_description_ending: "Nyní nastal čas pomoci lidem s programováním."
+    why_paragraph_1: "Při vytváření Skritteru neznal George základy programování a byl neustále frustrován svou neschopností implementovat vlastní nápady. Zkoušel se naučit programovat, ale lekce programování byly na něj příliš pomalé. Jeho spolubydlící se rozhodl o rekvalifikaci a tak zkusil Codeacademy, ale brzy toho nechal s tím, že je to příliš velká nuda. Týden co týden se někdo z Georgových přátel pokoušel využít Codeacademyk učení programování, ale po chvíli odpadl. Uvědomili jsme si, že se jedná o stejný problém, který jsme již vyřešili při tvorbě Skitteru: lidé se pokouší učit na pomalých, intenzivních teoretických lekcích, ale místo toho potřebují rychlé, ale obsáhlé praktické cvičení. A na tento problém známe řešení."
+    why_paragraph_2: "Potřebujete se naučit programovat? Pak nepotřebujete lekce, potřebuje příležitost psát spoustu kódu a při tom se u toho dobře bavit."
+    why_paragraph_3_prefix: "To je to o čem musí programování být. Ne rádoby zábava typu"
+    why_paragraph_3_italic: "hmm, další odznáček"
+    why_paragraph_3_center: "ale nadšení typu"
+    why_paragraph_3_italic_caps: "POČKEJ MAMI, MUSÍM DOKONČIT ÚROVEŇ!"
+    why_paragraph_3_suffix: "Proto je CodeCombat opravdová multiplayer hra, ne lekce kurzu s herními odznáčky. Neskončí, dokud sami nepřestanete, což je tentokrát dobrá věc."
+    why_paragraph_4: "A jestli se máte stát závislými na nějaké hře, pak ať je to hra tato, a staňte se díky tomu kouzelníky a odborníky v této technické době."
+    why_ending: "A mimochodem - je to zdarma. "
+    why_ending_url: "Začněte kouzlit!"
+    george_description: "CEO, obchodník, návrhář webů i her a šampión všech začátečníků programování."
+    scott_description: "Výtečný programátor, softwarový architekt, kouzelník v kuchyni i pán financí. Scott je v týmu pan rozumný."
+    nick_description: "Programátorský kouzelník, excentrický motivační mág i experimentátor. Nick by mohl dělat de-facto cokoliv, ale zvolil si vytvořit CodeCombat."
+    jeremy_description: "Mistr zákaznické podpory, tester použitelnosti a organizátor komunity. Je velmi pravděpodobné, že jste si spolu již psali."
+    michael_description: "Programátor, systémový administrátor a král podsvětí technického zázemí. Michael udržuje naše servery online."
 
-#  general:
-#    and: "and"
+  legal:
+    page_title: "Licence"
+    opensource_intro: "CodeCombat je zdarma a plně open source."
+    opensource_description_prefix: "Podívejte se na "
+    github_url: "naši stránku na GitHubu"
+    opensource_description_center: "a pokud se vám chce, můžete i pomoct! CodeCombat je vystavěn na několika oblíbených svobodných projektech. Podívejte se na"
+    archmage_wiki_url: "naši wiki Arcikouzelníků "
+    opensource_description_suffix: "pro seznam projektů, díky kterým může tato hra existovat."
+    practices_title: "Doporučené postupy"
+    practices_description: "Toto je příslib našeho přístupu v jednoduchém jazyce."
+    privacy_title: "Soukromí"
+    privacy_description: "Neprodáme vaše osobní informace. Náš plán na zhodnocení je založen na poskytování pracovních příležitostí, přesto si můžete být jisti, že vaše osobní informace nebudou distribuovány bez vašeho plného souhlasu."
+    security_title: "Zabezpečení"
+    security_description: "Usilujeme o to, abychom udrželi vaše osobní informace v bezpečí. Jako otevřený projekt jsme přístupni komukoliv k provedení kontroly kódu pro zlepšení našich bezpečnostních systémů."
+    email_title: "Email"
+    email_description_prefix: "Nebudeme vás zaplavovat nevyžádanou korespondencí. Pomocí "
+    email_settings_url: " nastavení emailu"
+    email_description_suffix: "nebo skrze odkazy v odeslaných emailech si můžete nastavit nebo se kdykoliv odhlásit z naší korespondence."
+    cost_title: "Cena"
+    cost_description: "Momentálně je CodeCombat 100% zdarma! Naší snahou je udržet přístup zdarma, abychom dali možnost hrát co největšímu množství lidí. V případě nutnosti budeme muset přejít na placený vstup nebo platbu za přístup k určitému obsahu, ale raději bychom se tomu vyhnuli. S trochou štěstí doufáme v následující plán monetizace:"
+    recruitment_title: "Nábor"
+    recruitment_description_prefix: "Zde na CodeCombatu se stanete mocným kouzelníkem a to nejen ve hře, ale i v reálném životě."
+    url_hire_programmers: "O dobré programátory je stále velký zájem "
+    recruitment_description_suffix: "takže až se vypracujete a pokud budete souhlasit, budeme demonstrovat vaše nejlepší programátorské úspěchy tisícovkám zaměstnavatelů, kteří by vás rádi zaměstnali. Ti nám zaplatí něco málo, ale vám pak zaplatí "
+    recruitment_description_italic: "daleko více,"
+    recruitment_description_ending: "tato hra zůstane zdarma a všichni budou spokojeni. Takový je plán."
+    copyrights_title: "Copyrights a Licence"
+    contributor_title: "Licenční ujednání přispívatelů (CLA)"
+    contributor_description_prefix: "Všichni přispívatelé jak na webu tak do projektu na GitHubu spadají pod naše "
+    cla_url: "CLA"
+    contributor_description_suffix: "se kterým je nutno souhlasit před tím, nežli přispějete."
+    code_title: "Kód - MIT"
+    code_description_prefix: "Veškerý kód vlastněný CodeCombatem nebo hostovaným na codecombat.com, kód v repozitáři na GitHub repository nebo v databázi codecombat.com, je licencován pod "
+    mit_license_url: "MIT licencí"
+    code_description_suffix: "Zahrnut je veškerý kód v systémech a komponentech, které jsou zpřístupněné CodeCombatem pro vytváření úrovní."
+    art_title: "Art/Hudba - Creative Commons "
+    art_description_prefix: "Veškerý obecný obsah je dostupný pod "
+    cc_license_url: "Mezinárodní Licencí Creative Commons Attribution 4.0"
+    art_description_suffix: "Obecným obsahem se rozumí vše dostupné na CodeCombatu, určené k vytváření úrovní. To zahrnuje:"
+    art_music: "Hudbu"
+    art_sound: "Zvuky"
+    art_artwork: "Umělecká díla"
+    art_sprites: "Doplňkový kód"
+    art_other: "A veškeré další kreativní práce použité při vytváření úrovní."
+    art_access: "Momentálně neexistuje jednoduchý systém pro stažení těchto součástí, částí úrovní a podobně. Lze je stáhnout z URL adres na tomto webu, můžete nás kontaktovat se žádostí o informace nebo nám i pomoci ve sdílení a vytváření systému pro jednoduché sdílení těchto doplňkových součástí."
+    art_paragraph_1: "Při uvádění zdroje, uvádějte prosím jméno a odkaz na codecombat.com v místech, která jsou vhodná a kde je to možné. Například:"
+    use_list_1: "Při použití ve filmu uveďte codecombat.com v titulcích."
+    use_list_2: "Při použití na webu, zahrňte odkaz například pod obrázkem/odkazem, nebo na stránce uvádějící zdroj, kde také zmíníte další Creative Commons díla a další použité open source projekty. Ostatní, na CodeCombat odkazující se práce (například článek na blogu zmiňující CodeCombat) není nutno separátně označovat a uvádět zdroj."
+    art_paragraph_2: "Využíváte-li obsah vytvořený některým uživatelem na codecombat.com, uvádějte odkaz na zdroj přímo na tohoto autora a následujte doporučení uvádění zdroje daného obsahu, je-li uvedeno."
+    rights_title: "Práva vyhrazena"
+    rights_desc: "Všechna práva jsou vyhrazena jednotlivým samostatným úrovním. To zahrnuje"
+    rights_scripts: "Skripty"
+    rights_unit: "Unit konfigurace"
+    rights_description: "Popisy"
+    rights_writings: "Zápisy"
+    rights_media: "Média (zvuky, hudba) a další tvořivý obsah vytvořený specificky pro tuto úroveň, který nebyl zpřístupněn při vytváření úrovně."
+    rights_clarification: "Pro ujasnění - vše, co je dostupné v editoru úrovní při vytváření úrovně spadá pod CC, ale obsah vytvořený v editoru úrovní nebo nahraný při vytváření spadá pod úroveň."
+    nutshell_title: "Ve zkratce"
+    nutshell_description: "Vše co je poskytnuto v editoru úrovní  je zdarma a mžete toho využít při vytváření úrovní. Ale vyhrazujeme si právo omezit distribuci úrovní samotných (těch, které byly vytvořeny na codecombat.com), takže v budoucnu bude možno tyto zpoplatnit, bude-li to v nejhorším případě nutné"
+    canonical: "Anglická verze tohoto dokumentu je původní, rozhodující verzí. Nastane-li rozdíl v překladu, Anglická verze bude mít vždy přednost."
 
-#  about:
-#    who_is_codecombat: "Who is CodeCombat?"
-#    why_codecombat: "Why CodeCombat?"
-#    who_description_prefix: "together started CodeCombat in 2013. We also created "
-#    who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters."
-#    who_description_ending: "Now it's time to teach people to write code."
-#    why_paragraph_1: "When making Skritter, George didn't know how to program and was constantly frustrated by his inability to implement his ideas. Afterwards, he tried learning, but the lessons were too slow. His housemate, wanting to reskill and stop teaching, tried Codecademy, but \"got bored.\" Each week another friend started Codecademy, then dropped off. We realized it was the same problem we'd solved with Skritter: people learning a skill via slow, intensive lessons when what they need is fast, extensive practice. We know how to fix that."
-#    why_paragraph_2: "Need to learn to code? You don't need lessons. You need to write a lot of code and have a great time doing it."
-#    why_paragraph_3_prefix: "That's what programming is about. It's gotta be fun. Not fun like"
-#    why_paragraph_3_italic: "yay a badge"
-#    why_paragraph_3_center: "but fun like"
-#    why_paragraph_3_italic_caps: "NO MOM I HAVE TO FINISH THE LEVEL!"
-#    why_paragraph_3_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing."
-#    why_paragraph_4: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age."
-#    why_ending: "And hey, it's free. "
-#    why_ending_url: "Start wizarding now!"
-#    george_description: "CEO, business guy, web designer, game designer, and champion of beginning programmers everywhere."
-#    scott_description: "Programmer extraordinaire, software architect, kitchen wizard, and master of finances. Scott is the reasonable one."
-#    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
-#    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
-#    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+  contribute:
+    page_title: "Přispívání"
+    character_classes_title: "Obsazení rolí"
+    introduction_desc_intro: "Vkládáme do CodeCombatu velké naděje."
+    introduction_desc_pref: "Chceme být to místo, ve kterém se všichni programátoři sejdou pro společnou hru a učení, uvedou další do úžasného světa programování a kde se předvede elita. Víme, že toto sami nezvládneme, jsou to lidé, kteří dělají projekty typu GitHub, Stack Overflow a Linux úspěšnými. Za tímto účelem, "
+    introduction_desc_github_url: "CodeCombat je kompletně open source"
+    introduction_desc_suf: "a snažíme se jak jen to jde, abychom vám umožnili se do tohoto projektu zapojit."
+    introduction_desc_ending: "Doufáme, že se k nám přidáte!"
+    introduction_desc_signature: "- Nick, George, Scott, Michael a Jeremy"
+    alert_account_message_intro: "Vítejte!"
+    alert_account_message_pref: "K přihlášení odebírání emailů si nejprve musíte  "
+    alert_account_message_suf: "vytvořit účet"
+    alert_account_message_create_url: "."
+    archmage_introduction: "Jedna z nejlepších věcí na vytváření her je to, že se jedná o spojení různých procesů. Grafika, zvuk, síťování v reálném čase, mezilidské vztahy a samozřejmě také spousta běžných aspektů programování, od nízkoúrovňového managementu databáze přes administraci serverů až po tvorbu uživatelská rozhraní. Je zde spousta práce a pokud jste zkušený programátor a všeuměl připravený k ponoření se do hloubek CodeCombatu, tato skupina je pro vás. Budeme moc rádi za vaši pomoc při tvorbě té nejlepší programovací hry."
+    class_attributes: "Vlastnosti"
+    archmage_attribute_1_pref: "Znáte "
+    archmage_attribute_1_suf: "nebo se jej chcete naučit. Je v něm většina našeho kódu. Je-li vaším oblíbeným jazykem Ruby nebo Python, budete se cítit jako doma. Je to JavaScript, ale s lepší syntaxí."
+    archmage_attribute_2: "Zkušenosti s programováním a osobní iniciativa. Pomůžeme vám se zorientovat, ale nemůžeme vás učit."
+    how_to_join: "Jak se přidat"
+    join_desc_1: "Pomoct může kdokoliv! Pro začátek se podívejte na naši stránku na "
+    join_desc_2: " , zaškrtněte políčko níže - označíte se tím jako statečný Arcimág a začnete dostávat informace o novinkách emailem. Chcete popovídat o tom jak začít? "
+    join_desc_3: ", nebo se s námi spojte v naší "
+    join_desc_4: "!"
+    join_url_email: "Pošlete nám email"
+    join_url_hipchat: "veřejné HipChat chatovací místnosti"
+    more_about_archmage: "Dozvědět se více o tom, jak se stát mocným Arcimágem"
+    archmage_subscribe_desc: "Dostávat emailem oznámení a informacemi nových programovacích příležitostech"
+    artisan_introduction_pref: "Musíme vytvářet další úrovně! Lidé nás prosí o další obsah, ale sami zvládáme vytvořit jen málo. Naším prvním pracovním zastavením je první úroveň. Editor úrovní je tak-tak použitelný i pro jeho vlastní tvůrce. Máte-li vizi pro vytvoření vnořených úrovní alá "
+    artisan_introduction_suf: "pak neváhejte, toto je vaše destinace."
+    artisan_attribute_1: "Předchozí zkušenosti s vytvářením podobného obsahu by byly vítány, například z editorů úrovní Blizzardu, ale nejsou vyžadovány!"
+    artisan_attribute_2: "Připraveni ke spoustě testování a pokusů. K vytvoření dobré úrovně je potřeba je představit ostatním, nechat je hrát a pak je z velké části měnit a opravovat."
+    artisan_attribute_3: "Pro teď, stejné jako Dobrodruh - tester úrovní. Náš editor úrovní je ve velmi raném stádiu a frustrující při používání. Varovali jsme vás!"
+    artisan_join_desc: "Použijte editor úrovní v těchto postupných krocích:"
+    artisan_join_step1: "Přečtěte si dokumentaci."
+    artisan_join_step2: "Vytvořte novou úroveň a prozkoumejte existující úrovně."
+    artisan_join_step3: "Požádejte nás o pomoc ve veřejné  HipChat místnosti."
+    artisan_join_step4: "Zveřejněte vaši úroveň na fóru pro připomínkování."
+    more_about_artisan: "Dozvědět se více o tom, jak se stát kreativním Řemeslníkem"
+    artisan_subscribe_desc: "Dostávat emailem oznámení a informace o aktualizacích editoru úrovní."
+    adventurer_introduction: "Ujasněme si dopředu jednu věc o vaší roli: budete jako tank. Projdete ohněm. Potřebujeme někoho, kdo odzkouší zbrusu nové úrovně a pomůže identifikovat kde je možno je zlepšit. Ten boj bude ohromný - tvorba her je dlouhý proces, který nikdo nezvládne na první pokus. Máte-li na to a vydržíte-li to, pak toto je vaše skupina."
+    adventurer_attribute_1: "Touha po učení se. Vy se chcete naučit programovat a my vás to chceme naučit. Jenom, v tomto případě to budete vy, kdo bude vyučovat."
+    adventurer_attribute_2: "Charismatický. Buďte mírný a pečlivě artikulujte co a jak je potřeba zlepšit."
+    adventurer_join_pref: "Buďto se spojte (nebo si najděte!) Dobrodruha a pracujte s ním, nebo zaškrtněte políčko níže a dostávejte emaily o dostupnosti nových úrovní k testování. Budeme také posílat informace o nových úrovních k recenzím na sociálních webech, "
+    adventurer_forum_url: " našem fóru"
+    adventurer_join_suf: "takže pokud chcete být v obraze, připojte se k nám!"
+    more_about_adventurer: "Dozvědět se více o tom, jak se stát statečným Dobrodruhem"
+    adventurer_subscribe_desc: "Dostávat emailem oznámení a informace nových úrovních k testování."    
+    scribe_introduction_pref: "CodeCombat nebude pouze kupa úrovní. Bude také zahrnovat informační zdroje a wiki programovacích konceptů na které se úrovně mohou navázat. Takto, namísto toho aby každý Řemeslník musel sám do detailu popsatco který operátor dělá, mohou jednoduše nalinkovat svoji úroveň na článek existující k edukaci hráčů.  Něco ve stylu "
+    scribe_introduction_url_mozilla: "Mozilla Developer Network"
+    scribe_introduction_suf: ". Jestliže vás baví popisovat a předávat koncept programování v Markdown editoru, pak tato role může být právě pro vás."
+    scribe_attribute_1: "Zkušenost s psaním je jediné co budete potřebovat. Nejen gramatika, ale také schopnost popsat složité koncepty a myšlenky ostatním."
+    contact_us_url: "Spojte se s námi"
+    scribe_join_description: "dejte nám o vás vědět, o vašich zkušenostech s programováním a o čm byste rádi psali. Od toho začneme!"
+    more_about_scribe: "Dozvědět se více o tom, jak se stát pilným Pisálkem"
+    scribe_subscribe_desc: "Dostávat emailem oznámení a informace o článcích."
+    diplomat_introduction_pref: "Jedna z věcí, kterou jsme zjistili během "
+    diplomat_launch_url: "zahájení v Říjnu"
+    diplomat_introduction_suf: "bylo, že o CodeCombat je velký zájem i v jiných zemích, obzvláště v Brazílii! Chystáme regiment překladatelů ke zpřístupnění CodeCombatu světu. Pokud chcete nakouknout pod pokličku, dozvědět se o připravovaných novinkách a zpřístupnit úrovně vašim národním kolegům, toto je role pro vás."
+    diplomat_attribute_1: "Plynulost v angličtině a v jazyce do kterého budete překládat. Při předávání komplexních myšlenek je důležité si být jistí v kramflecích v obou jazycích!"
+    diplomat_join_pref: "Úvodní překladatelský počin začal v tomto "
+    diplomat_doc_url: "příspěvku na fóru"
+    diplomat_join_suf: ", tak si jej přečtěte a případně doplňte informace o vašem překladu. Přihlaste se také k odběru informací o vývoji v internacionalizaci!"
+    more_about_diplomat: "Dozvědět se více o tom, jak se stát Diplomatem"
+    diplomat_subscribe_desc: "Dostávat emailem oznámení a informace o internacionalizaci a o úrovních k překladu."
+    ambassador_introduction: "Zde se tvoří komunita a vy jste její spojení. Využíváme chat, emaily a sociální sítě se spoustou lidí k informování a diskuzím a seznámení s naší hrou. Chcete-li pomoci lidem se přidat a pobavit se a získat dobrý náhled na CodeCombat a kam směřujeme, pak toto je vaše role."
+    ambassador_attribute_1: "Komunikační schopnosti. Schopnost identifikovat problémy hráčů a pomoci jim je řešit. Naslouchat co hráči říkají, co mají rádi a co rádi nemají a komunikovat to zpět ostatním!"
+    ambassador_join_desc: "dejte nám o sobě vědět, o tom co děláte a co byste rádi dělali. Od toho začneme!"
+    ambassador_join_note_strong: "Poznámka"
+    ambassador_join_note_desc: "Jedna z našich priorit je vytvoření vícehráčové hry, kde hráč, který má problém s řešením úrovní může oslovit a požádat o pomoc zkušenější kouzelníky. To je přesně ten případ a místo pro pomoc Velvyslance . Dáme vám vědět více!"
+    more_about_ambassador: "Dozvědět se více o tom, jak se stát nápomocným Velvyslancem"
+    ambassador_subscribe_desc: "Dostávat emailem oznámení a informace o vývoji v podpoře a vícehráčové hře."
+    counselor_introduction_1: "Máte životní zkušenosti? Máte odlišný náhled na věci a jste schopni nám tímto pomoci v dalším vývoji CodeCombatu? Jedna z důležitých rolí i když asi nejméně časově náročná, nicméně každá individualita je schopná udělat velký rozdíl. Hledáme zkušené odborníky, zvláště pak v oblastech vzdělávání, vývoji her managementu open source,  source project management, náboru lidských zdrojů, podnikání nebo  designu."
+    counselor_introduction_2: "Nebo cokoliv, co je relevantní ve vývoji CodeCombatu. Máte-li znalosti a jste-li ochotni se o ně podělit pro další růst tohoto projektu , pak toto je role pro vás."
+    counselor_attribute_1: "Zkušenosti ve výše zmíněných oblastech, nebo něco, čím byste mohli být nápomocni."
+    counselor_attribute_2: "Troška volného času!"
+    counselor_join_desc: "dejte nám o sobě vědět, o tom co děláte a co byste rádi dělali. Přidáme si vás do seznamu a budeme vás kontaktovat v případě, že to bude potřeba (ne moc často)."
+    more_about_counselor: "Dozvědět se více o tom, jak se stát Poradcem"
+    changes_auto_save: "Změny jsou automaticky uloženy při kliknutí na zaškrtávací políčka."
+    diligent_scribes: "Naši pilní Písaři:"
+    powerful_archmages: "Naši mocní Arcimágové:"
+    creative_artisans: "Naši kreativní Řemeslníci:"
+    brave_adventurers: "Naši stateční Dobrodruzi:"
+    translating_diplomats: "Naši překladatelští Diplomati:"
+    helpful_ambassadors: "Naši nápomocní Velvyslanci:"
 
-#  legal:
-#    page_title: "Legal"
-#    opensource_intro: "CodeCombat is free to play and completely open source."
-#    opensource_description_prefix: "Check out "
-#    github_url: "our GitHub"
-#    opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See "
-#    archmage_wiki_url: "our Archmage wiki"
-#    opensource_description_suffix: "for a list of the software that makes this game possible."
-#    practices_title: "Respectful Best Practices"
-#    practices_description: "These are our promises to you, the player, in slightly less legalese."
-#    privacy_title: "Privacy"
-#    privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent."
-#    security_title: "Security"
-#    security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems."
-#    email_title: "Email"
-#    email_description_prefix: "We will not inundate you with spam. Through"
-#    email_settings_url: "your email settings"
-#    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
-#    cost_title: "Cost"
-#    cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:"
-#    recruitment_title: "Recruitment"
-#    recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life."
-#    url_hire_programmers: "No one can hire programmers fast enough"
-#    recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you"
-#    recruitment_description_italic: "a lot"
-#    recruitment_description_ending: "the site remains free and everybody's happy. That's the plan."
-#    copyrights_title: "Copyrights and Licenses"
-#    contributor_title: "Contributor License Agreement"
-#    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
-#    cla_url: "CLA"
-#    contributor_description_suffix: "to which you should agree before contributing."
-#    code_title: "Code - MIT"
-#    code_description_prefix: "All code owned by CodeCombat or hosted on codecombat.com, both in the GitHub repository or in the codecombat.com database, is licensed under the"
-#    mit_license_url: "MIT license"
-#    code_description_suffix: "This includes all code in Systems and Components that are made available by CodeCombat for the purpose of creating levels."
-#    art_title: "Art/Music - Creative Commons "
-#    art_description_prefix: "All common content is available under the"
-#    cc_license_url: "Creative Commons Attribution 4.0 International License"
-#    art_description_suffix: "Common content is anything made generally available by CodeCombat for the purpose of creating Levels. This includes:"
-#    art_music: "Music"
-#    art_sound: "Sound"
-#    art_artwork: "Artwork"
-#    art_sprites: "Sprites"
-#    art_other: "Any and all other non-code creative works that are made available when creating Levels."
-#    art_access: "Currently there is no universal, easy system for fetching these assets. In general, fetch them from the URLs as used by the site, contact us for assistance, or help us in extending the site to make these assets more easily accessible."
-#    art_paragraph_1: "For attribution, please name and link to codecombat.com near where the source is used or where appropriate for the medium. For example:"
-#    use_list_1: "If used in a movie or another game, include codecombat.com in the credits."
-#    use_list_2: "If used on a website, include a link near the usage, for example underneath an image, or in a general attributions page where you might also mention other Creative Commons works and open source software being used on the site. Something that's already clearly referencing CodeCombat, such as a blog post mentioning CodeCombat, does not need some separate attribution."
-#    art_paragraph_2: "If the content being used is created not by CodeCombat but instead by a user of codecombat.com, attribute them instead, and follow attribution directions provided in that resource's description if there are any."
-#    rights_title: "Rights Reserved"
-#    rights_desc: "All rights are reserved for Levels themselves. This includes"
-#    rights_scripts: "Scripts"
-#    rights_unit: "Unit configuration"
-#    rights_description: "Description"
-#    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_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
-#    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
-
-#  contribute:
-#    page_title: "Contributing"
-#    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"
-#    introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours."
-#    introduction_desc_ending: "We hope you'll join our party!"
-#    introduction_desc_signature: "- Nick, George, Scott, Michael, and Jeremy"
-#    alert_account_message_intro: "Hey there!"
-#    alert_account_message_pref: "To subscribe for class emails, you'll need to "
-#    alert_account_message_suf: "first."
-#    alert_account_message_create_url: "create an account"
-#    archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever."
-#    class_attributes: "Class Attributes"
-#    archmage_attribute_1_pref: "Knowledge in "
-#    archmage_attribute_1_suf: ", or a desire to learn. Most of our code is in this language. If you're a fan of Ruby or Python, you'll feel right at home. It's JavaScript, but with a nicer syntax."
-#    archmage_attribute_2: "Some experience in programming and personal initiative. We'll help you get oriented, but we can't spend much time training you."
-#    how_to_join: "How To Join"
-#    join_desc_1: "Anyone can help out! Just check out our "
-#    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_hipchat: "public HipChat room"
-#    more_about_archmage: "Learn More About Becoming A Powerful Archmage"
-#    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
-#    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "to then this class might be for you."
-#    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
-#    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
-#    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
-#    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
-#    artisan_join_step1: "Read the documentation."
-#    artisan_join_step2: "Create a new level and explore existing levels."
-#    artisan_join_step3: "Find us in our public HipChat room for help."
-#    artisan_join_step4: "Post your levels on the forum for feedback."
-#    more_about_artisan: "Learn More About Becoming A Creative Artisan"
-#    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
-#    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
-#    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
-#    adventurer_attribute_2: "Charismatic. Be gentle but articulate about what needs improving, and offer suggestions on how to improve."
-#    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
-#    adventurer_forum_url: "our forum"
-#    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    more_about_adventurer: "Learn More About Becoming A Brave Adventurer"
-#    adventurer_subscribe_desc: "Get emails when there are new levels to test."
-#    scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
-#    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"
-#    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 Diligent Scribe"
-#    scribe_subscribe_desc: "Get emails about article writing announcements."
-#    diplomat_introduction_pref: "So, if there's one thing we learned from the "
-#    diplomat_launch_url: "launch in October"
-#    diplomat_introduction_suf: "it's that there is sizeable interest in CodeCombat in other countries, particularly Brazil! We're building a corps of translators eager to turn one set of words into another set of words to get CodeCombat as accessible across the world as possible. If you like getting sneak peeks at upcoming content and getting these levels to your fellow nationals ASAP, then this class might be for you."
-#    diplomat_attribute_1: "Fluency in English and the language you would like to translate to. When conveying complicated ideas, it's important to have a strong grasp in both!"
-#    diplomat_join_pref: "We've started a lot of initial translations at "
-#    diplomat_doc_url: "this forum post"
-#    diplomat_join_suf: "so check it out and add things for your language. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    more_about_diplomat: "Learn More About Becoming A Great Diplomat"
-#    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
-#    ambassador_introduction: "This is a community we're building, and you are the connections. We've got Olark chats, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
-#    ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
-#    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
-#    ambassador_join_note_strong: "Note"
-#    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-#    more_about_ambassador: "Learn More About Becoming A Helpful Ambassador"
-#    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming A Valuable 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:"
-
-#  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: "Arcikouzelník"
+    archmage_title_description: "(Programátor)"
+    artisan_title: "Řemeslník"
+    artisan_title_description: "(Tvůrce úrovní)"
+    adventurer_title: "Dobrodruh"
+    adventurer_title_description: "(Tester úrovní)"
+    scribe_title: "Pisálek"
+    scribe_title_description: "(Editor článků)"
+    diplomat_title: "Diplomat"
+    diplomat_title_description: "(Překladatel)"
+    ambassador_title: "Velvyslanec"
+    ambassador_title_description: "(Podpora)"
+    counselor_title: "Poradce"
+    counselor_title_description: "(Odborník)"

app/locale/da.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "dansk", englishDescription: "Danish", translation:
   common:
     loading: "Henter..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Gemmer..."
+    sending: "Sender..."
+    cancel: "Annuller"
+    save: "Gem"
+    delay_1_sec: "1 sekund"
+    delay_3_sec: "3 sekunder"
+    delay_5_sec: "5 sekunder"
+    manual: "Manual"
+    fork: "Forgren"
+    play: "Spil"
 
   modal:
     close: "Luk"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     page_not_found: "Siden blev ikke fundet"
 
   nav:
-    sign_up: "Opret Konto"
-    log_in: "Log Ind"
-    log_out: "Log Ud"
     play: "Spil"
     editor: "Editor"
     blog: "Blog"
@@ -26,44 +31,34 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     about: "Om"
     contact: "Kontakt"
     twitter_follow: "Følg"
-#    employers: "Employers"
+    employers: "Arbejdsgivere"
 
-  forms:
-    name: "Navn"
-    email: "Email"
-    message: "Besked"
-    cancel: "Annuller"
-#    save: "Save"
-
-#  versions:
-#    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+  versions:
+    save_version_title: "Gem ny version"
+    new_major_version: "Ny hoved Version"
+    cla_prefix: "For at gemme dine ændringer, må du acceptere brugerbetingelserne"
+    cla_url: "CLA"
+    cla_suffix: "."
+    cla_agree: "Jeg er enig"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "Log Ind"
     sign_up: "opret ny konto"
-    or: ", eller "
+    log_in: "Log Ind"
+    log_out: "Log Ud"
     recover: "genskab konto"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "genskab konto"
+    send_password: "Send kodeord"
 
   signup:
-#    create_account_title: "Create Account to Save Progress"
+    create_account_title: "Opret en konto for at gemme dit fremskridt"
     description: "Det er gratis. Du skal bare indtaste et par ting, så er du klar til at komme igang:"
     email_announcements: "Modtag nyheder på email"
     coppa: "13+ eller ikke-USA"
     coppa_why: "(Hvorfor?)"
     creating: "Opretter Konto..."
     sign_up: "Registrer"
-    or: "eller "
     log_in: "Log ind med password"
 
   home:
@@ -78,141 +73,137 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     adventurer_forum: "Eventyrer-forummet"
     adventurer_suffix: "."
     campaign_beginner: "Begynderkampagne"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
-#    campaign_player_created: "Player-Created"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
+    campaign_beginner_description: "... hvor du lærer programmeringens kunst."
+    campaign_dev: "Tilfældige Sværere Niveauer"
+    campaign_dev_description: "... hvor du lærer grænsefladen imens du udfører lidt sværere opgaver."
+    campaign_multiplayer: "Multiplayer Arenaer"
+    campaign_multiplayer_description: "... hvor du koder ansigt-til-ansigt imod andre spillere."
+    campaign_player_created: "Spillerkreerede"
+    campaign_player_created_description: "... hvor du kæmper mod dine med-<a href=\"/contribute#artisan\">Kunsthåndværker-troldmænd</a>s kreativitet."
+    level_difficulty: "Sværhedsgrad: "
 
-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
-#    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
-#    forum_suffix: " instead."
-#    sending: "Sending..."
-#    send: "Send Feedback"
+  contact:
+    contact_us: "Kontakt CodeCombat"
+    welcome: "Godt at høre fra dig! Brug denne formular til at sende os en email. "
+    contribute_prefix: "Hvis du er interesseret i at bidrage, så tjek vores "
+    contribute_page: "bidragsside"
+    contribute_suffix: "!"
+    forum_prefix: "For noget offentligt, prøv venligst "
+    forum_page: "vores forum"
+    forum_suffix: " istedet."
+    send: "Send Feedback"
 
   diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Danish 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 Danish."
-    missing_translations: "Until we can translate everything into Danish, you'll see English when Danish isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    title: "Hjælp med at oversætte CodeCombat!"
+    sub_heading: "Vi har brug for dine sprogfærdigheder."
+    pitch_body: "Vi udvikler CodeCombat på engelsk, men vi har allerede spillere over hele verden. Mange af dem vil gerne spille på dansk, men taler ikke engelsk, så hvis du kan begge, så overvej gerne at melde dig som Diplomat og hjælp med at oversætte både CodeCombat hjemmesiden og alle niveauer til dansk."
+    missing_translations: "Indtil vi har alting oversat til dansk, vil du se engelsk, når dansk ikke er tilgængeligt."
+    learn_more: "Lær mere om at være Diplomat"
+    subscribe_as_diplomat: "Meld dig som Diplomat"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
+  wizard_settings:
+    title: "Troldmandsinstillinger"
+    customize_avatar: "Tilpas din avatar"
 
-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
-#    me_tab: "Me"
-#    picture_tab: "Picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
-#    gravatar_select: "Select which Gravatar photo to use"
-#    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
-#    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
-#    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
-#    contributor_emails: "Contributor Class Emails"
-#    contribute_prefix: "We're looking for people to join our party! Check out the "
-#    contribute_page: "contribute page"
-#    contribute_suffix: " to find out more."
-#    email_toggle: "Toggle All"
-#    saving: "Saving..."
-#    error_saving: "Error Saving"
-#    saved: "Changes Saved"
-#    password_mismatch: "Password does not match."
+  account_settings:
+    title: "Kontoindstillinger"
+    not_logged_in: "Log ind eller opret en konto for at ændre dine indstillinger."
+    autosave: "Ændringer Gemmes Automatisk"
+    me_tab: "Mig"
+    picture_tab: "Billede"
+    wizard_tab: "Troldmand"
+    password_tab: "Password"
+    emails_tab: "Emails"
+    gravatar_select: "Vælg hvilket Gravatar-billede du vil bruge"
+    gravatar_add_photos: "Tilføj thumbnails og billeder til en Gravatar-konto for din email for at kunne vælge et billede."
+    gravatar_add_more_photos: "Tilføj flere billeder til din Gravatar-konto for at tilgå dem her."
+    wizard_color: "Farve på Troldmandstøj"
+    new_password: "Nyt Password"
+    new_password_verify: "Bekræft"
+    email_subscriptions: "Emailtilmeldinger"
+    email_announcements: "Nyheder"
+    email_notifications_description: "Få periodevise meldinger om din konto."
+    email_announcements_description: "Få emails om de seneste nyheder og udvikling på CodeCombat."
+    contributor_emails: "Bidragsklasse-emails"
+    contribute_prefix: "Vi leder efter folk til at joine vores gruppe! Tjek "
+    contribute_page: "bidragssiden"
+    contribute_suffix: " ud for at finde ud af mere."
+    email_toggle: "Skift Alle"
+    error_saving: "Fejl under Gemning"
+    saved: "Ændringer Gemt"
+    password_mismatch: "Password matcher ikke."
 
-#  account_profile:
-#    edit_settings: "Edit Settings"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    profile: "Profile"
-#    user_not_found: "No user found. Check the URL?"
-#    gravatar_not_found_mine: "We couldn't find your profile associated with:"
-#    gravatar_not_found_email_suffix: "."
-#    gravatar_signup_prefix: "Sign up at "
-#    gravatar_signup_suffix: " to get set up!"
-#    gravatar_not_found_other: "Alas, there's no profile associated with this person's email address."
-#    gravatar_contact: "Contact"
-#    gravatar_websites: "Websites"
-#    gravatar_accounts: "As Seen On"
-#    gravatar_profile_link: "Full Gravatar Profile"
+  account_profile:
+    edit_settings: "Redigér Indstillinger"
+    profile_for_prefix: "Profil for "
+    profile_for_suffix: ""
+    profile: "Profil"
+    user_not_found: "Ingen bruger fundet. Tjek URL'en?"
+    gravatar_not_found_mine: "Vi  kunne ikke finde din profil associeret med:"
+    gravatar_not_found_email_suffix: "."
+    gravatar_signup_prefix: "Opret dig hos "
+    gravatar_signup_suffix: " for at påbegynde"
+    gravatar_not_found_other: "Hov, der er ingen profil associeret med denne persons e-mail konto"
+    gravatar_contact: "Kontakt"
+    gravatar_websites: "Gravatar hjemmesider"
+    gravatar_accounts: "Som set på"
+    gravatar_profile_link: "Fuld Gravatar Profil"
 
-#  play_level:
-#    level_load_error: "Level could not be loaded."
-#    done: "Done"
-#    grid: "Grid"
-#    customize_wizard: "Customize Wizard"
-#    home: "Home"
-#    guide: "Guide"
-#    multiplayer: "Multiplayer"
-#    restart: "Restart"
-#    goals: "Goals"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
-#    reload_title: "Reload All Code?"
-#    reload_really: "Are you sure you want to reload this level back to the beginning?"
-#    reload_confirm: "Reload All"
+  play_level:
+    level_load_error: "Banen kunne ikke indlæses."
+    done: "Færdig"
+    grid: "Gitter"
+    customize_wizard: "Tilpas troldmand"
+    home: "Hjem"
+    guide: "Guide"
+    multiplayer: "Flere spillere"
+    restart: "Start forfra"
+    goals: "Mål"
+    action_timeline: "Handlingstidslinje"
+    click_to_select: "Klik på en enhed for at vælge"
+    reload_title: "Genindlæs alt kode?"
+    reload_really: "Er du sikker på at du ønsker at genindlæse denne bane helt fra begyndelsen?"
+    reload_confirm: "Genindlæs alt"
 #    victory_title_prefix: ""
-#    victory_title_suffix: " Complete"
-#    victory_sign_up: "Sign Up to Save Progress"
-#    victory_sign_up_poke: "Want to save your code? Create a free account!"
-#    victory_rate_the_level: "Rate the level: "
-#    victory_play_next_level: "Play Next Level"
-#    victory_go_home: "Go Home"
-#    victory_review: "Tell us more!"
-#    victory_hour_of_code_done: "Are You Done?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code!"
-#    multiplayer_title: "Multiplayer Settings"
-#    multiplayer_link_description: "Give this link to anyone to have them join you."
-#    multiplayer_hint_label: "Hint:"
-#    multiplayer_hint: " Click the link to select all, then press ⌘-C or Ctrl-C to copy the link."
-#    multiplayer_coming_soon: "More multiplayer features to come!"
-#    guide_title: "Guide"
+    victory_title_suffix: " Færdig"
+    victory_sign_up: "Opret dig for at gemme dit fremskridt"
+    victory_sign_up_poke: "Ønsker du at gemme din kode? Opret en gratis konto!"
+    victory_rate_the_level: "Bedøm denne bane: "
+    victory_play_next_level: "Spil næste bane"
+    victory_go_home: "Gå hjem"
+    victory_review: "Fortæl os mere!"
+    victory_hour_of_code_done: "Er du færdig?"
+    victory_hour_of_code_done_yes: "Ja, jeg er færdig med min Kodetime!"
+    multiplayer_title: "Flerspillerinstillinger"
+    multiplayer_link_description: "Del dette link med andre deltagere."
+    multiplayer_hint_label: "Tip:"
+    multiplayer_hint: " Klik på linket for markere alt; tryk derefter ⌘-C eller Ctrl-C tfr at kopiere linket."
+    multiplayer_coming_soon: "Yderligere flerspillermuligheder er på vej!"
+    guide_title: "Instruktioner"
 #    tome_minion_spells: "Your Minions' Spells"
 #    tome_read_only_spells: "Read-Only Spells"
-#    tome_other_units: "Other Units"
+    tome_other_units: "Andre enheder"
 #    tome_cast_button_castable: "Cast"
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
-#    tome_select_spell: "Select a Spell"
-#    tome_select_a_thang: "Select Someone for "
-#    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+    tome_select_spell: "Vælg en trylleformular"
+    tome_select_a_thang: "Vælg nogen til at "
+    tome_available_spells: "Tilgængelige trylleformularer"
+    hud_continue: "Fortsæt (tryk skift-mellemrum)"
+    spell_saved: "Trylleformularen er gemt"
 
-#  admin:
+  admin:
 #    av_title: "Admin Views"
 #    av_entities_sub_title: "Entities"
-#    av_entities_users_url: "Users"
+    av_entities_users_url: "Brugere"
 #    av_entities_active_instances_url: "Active Instances"
-#    av_other_sub_title: "Other"
+    av_other_sub_title: "Andre"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
-#    u_title: "User List"
-#    lg_title: "Latest Games"
+    u_title: "Brugerliste"
+    lg_title: "Seneste spil"
 
-#  editor:
+  editor:
 #    main_title: "CodeCombat Editors"
 #    main_description: "Build your own levels, campaigns, units and educational content. We provide all the tools you need!"
 #    article_title: "Article Editor"
@@ -222,66 +213,52 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    level_title: "Level Editor"
 #    level_description: "Includes the tools for scripting, uploading audio, and constructing custom logic to create all sorts of levels. Everything we use ourselves!"
 #    security_notice: "Many major features in these editors are not currently enabled by default. As we improve the security of these systems, they will be made generally available. If you'd like to use these features sooner, "
-#    contact_us: "contact us!"
-#    hipchat_prefix: "You can also find us in our"
-#    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
+    contact_us: "kontact os!"
+    hipchat_prefix: "Du kan også finde os på vores"
+    hipchat_url: "HipChat kanal."
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
-#    level_tab_settings: "Settings"
-#    level_tab_components: "Components"
-#    level_tab_systems: "Systems"
+    level_tab_settings: "Instillinger"
+    level_tab_components: "Komponenter"
+    level_tab_systems: "Systemer"
 #    level_tab_thangs_title: "Current Thangs"
 #    level_tab_thangs_conditions: "Starting Conditions"
 #    level_tab_thangs_add: "Add Thangs"
-#    level_settings_title: "Settings"
-#    level_component_tab_title: "Current Components"
-#    level_component_btn_new: "Create New Component"
-#    level_systems_tab_title: "Current Systems"
-#    level_systems_btn_new: "Create New System"
-#    level_systems_btn_add: "Add System"
+    level_settings_title: "Instillinger"
+    level_component_tab_title: "Nuværende komponenter"
+    level_component_btn_new: "Opret ny komponent"
+    level_systems_tab_title: "Nuværende systemer"
+    level_systems_btn_new: "Opret nyt system"
+    level_systems_btn_add: "Tilføj system"
 #    level_components_title: "Back to All Thangs"
 #    level_components_type: "Type"
-#    level_component_edit_title: "Edit Component"
-#    level_system_edit_title: "Edit System"
-#    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
-#    new_component_title: "Create New Component"
-#    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
+    level_component_edit_title: "Redigér komponent"
+    level_system_edit_title: "Redigér system"
+    create_system_title: "Opret nyt system"
+    new_component_title: "Opret ny komponent"
+    new_component_field_system: "System"
 
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
+  article:
+    edit_btn_preview: "Forhåndsvisning"
+    edit_article_title: "Ændr artikkel"
 
-#  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
-#    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
-#    edit_article_title: "Edit Article"
+  general:
+    and: "og"
+    name: "navn"
+    body: "krop"
+    version: "version"
+    commit_msg: "ændringsnotat"
+    version_history_for: "versionhistorie for: "
+    results: "resultater"
+    description: "beskrivelse"
+    email: "e-mail"
+    message: "Besked"
+    or: "eller"
 
-#  general:
-#    and: "and"
-
-#  about:
-#    who_is_codecombat: "Who is CodeCombat?"
-#    why_codecombat: "Why CodeCombat?"
+  about:
+    who_is_codecombat: "Hvem er CodeCombat?"
+    why_codecombat: "Hvorfor CodeCombat?"
 #    who_description_prefix: "together started CodeCombat in 2013. We also created "
 #    who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters."
 #    who_description_ending: "Now it's time to teach people to write code."
@@ -293,7 +270,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    why_paragraph_3_italic_caps: "NO MOM I HAVE TO FINISH THE LEVEL!"
 #    why_paragraph_3_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing."
 #    why_paragraph_4: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age."
-#    why_ending: "And hey, it's free. "
+    why_ending: "Og det er ovenikøbet gratis."
 #    why_ending_url: "Start wizarding now!"
 #    george_description: "CEO, business guy, web designer, game designer, and champion of beginning programmers everywhere."
 #    scott_description: "Programmer extraordinaire, software architect, kitchen wizard, and master of finances. Scott is the reasonable one."
@@ -305,7 +282,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    page_title: "Legal"
 #    opensource_intro: "CodeCombat is free to play and completely open source."
 #    opensource_description_prefix: "Check out "
-#    github_url: "our GitHub"
+    github_url: "vores GitHub"
 #    opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See "
 #    archmage_wiki_url: "our Archmage wiki"
 #    opensource_description_suffix: "for a list of the software that makes this game possible."
@@ -313,11 +290,11 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    practices_description: "These are our promises to you, the player, in slightly less legalese."
 #    privacy_title: "Privacy"
 #    privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent."
-#    security_title: "Security"
+    security_title: "Sikkerhed"
 #    security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems."
-#    email_title: "Email"
+    email_title: "E-mail"
 #    email_description_prefix: "We will not inundate you with spam. Through"
-#    email_settings_url: "your email settings"
+    email_settings_url: "dine e-mail instillinger"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
 #    cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:"
@@ -340,8 +317,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    art_description_prefix: "All common content is available under the"
 #    cc_license_url: "Creative Commons Attribution 4.0 International License"
 #    art_description_suffix: "Common content is anything made generally available by CodeCombat for the purpose of creating Levels. This includes:"
-#    art_music: "Music"
-#    art_sound: "Sound"
+    art_music: "Musik"
+    art_sound: "Lyd"
 #    art_artwork: "Artwork"
 #    art_sprites: "Sprites"
 #    art_other: "Any and all other non-code creative works that are made available when creating Levels."
@@ -358,19 +335,20 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    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: "I en nødeskal"
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
 
-#  contribute:
+  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    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"
 #    introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours."
-#    introduction_desc_ending: "We hope you'll join our party!"
-#    introduction_desc_signature: "- Nick, George, Scott, Michael, and Jeremy"
-#    alert_account_message_intro: "Hey there!"
+    introduction_desc_ending: "Vi håber du vil deltage i vores fest!"
+    introduction_desc_signature: "- Nick, George, Scott, Michael, ogJeremy"
+    alert_account_message_intro: "Hej med dig!"
 #    alert_account_message_pref: "To subscribe for class emails, you'll need to "
 #    alert_account_message_suf: "first."
 #    alert_account_message_create_url: "create an account"
@@ -384,7 +362,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    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: "Skriv til os"
 #    join_url_hipchat: "public HipChat room"
 #    more_about_archmage: "Learn More About Becoming A Powerful Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
@@ -394,8 +372,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
 #    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
-#    artisan_join_step1: "Read the documentation."
-#    artisan_join_step2: "Create a new level and explore existing levels."
+    artisan_join_step1: "Læs dokumentationen."
+    artisan_join_step2: "Lav en ny bane og udforsk eksisterende baner."
 #    artisan_join_step3: "Find us in our public HipChat room for help."
 #    artisan_join_step4: "Post your levels on the forum for feedback."
 #    more_about_artisan: "Learn More About Becoming A Creative Artisan"
@@ -446,18 +424,18 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    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: "Ærkemager"
+    archmage_title_description: "(Programmør)"
+    artisan_title: "Artisan"
+    artisan_title_description: "(Banedesigner)"
+    adventurer_title: "Eventyrer"
+    adventurer_title_description: "(Banetester)"
+    scribe_title: "Skriver"
+    scribe_title_description: "(Artikkel redaktør)"
+    diplomat_title: "Diplomat"
+    diplomat_title_description: "(Oversætter)"
+    ambassador_title: "Ambassadør"
+    ambassador_title_description: "(Brugerstøtte)"
+    counselor_title: "Rådgiver"
+    counselor_title_description: "(Ekspert/Lærer)"

app/locale/de.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "Deutsch", englishDescription: "German", translation:
   common:
     loading: "Lade..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Speichere..."
+    sending: "Übertrage..." # or Sende... ?
+    cancel: "Abbrechen"
+    save: "Speichern"
+    delay_1_sec: "1 Sekunde"
+    delay_3_sec: "3 Sekunden"
+    delay_5_sec: "5 Sekunden"
+    manual: "Manuell"
+#    fork: "Fork"
+    play: "Abspielen"
 
   modal:
     close: "Schliessen"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     page_not_found: "Seite nicht gefunden"
 
   nav:
-    sign_up: "Registrieren"
-    log_in: "Einloggen"
-    log_out: "Ausloggen"
     play: "Spielen"
     editor: "Editor"
     blog: "Blog"
@@ -26,44 +31,34 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     about: "Über"
     contact: "Kontakt"
     twitter_follow: "Twitter"
-#    employers: "Employers"
+    employers: "Mitarbeiter"
 
-  forms:
-    name: "Name"
-    email: "Email"
-    message: "Nachricht"
-    cancel: "Abbrechen"
-#    save: "Save"
-
-#  versions:
-#    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+  versions:
+    save_version_title: "Neue Version speichern"
+    new_major_version: "Neue Hauptversion"
+    cla_prefix: "Damit Änderungen gespeichert werden können, musst du unsere Lizenzbedingungen ("  #  To save changes, first you must agree to our ...
+    cla_url: "CLA" # ? CLA: What is this? -> CodeCombat Individual Contributor License Agreement
+    cla_suffix: ") akzeptieren."
+    cla_agree: "Ich stimme zu" # die Bestimmungen / I agree the rules
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Registrieren"
     log_in: "Einloggen"
-    sign_up: "Neuen Account anlegen"
-    or: ", oder "
+    log_out: "Ausloggen"
     recover: "Account wiederherstellen"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Account Wiederherstellung"
+    send_password: "Wiederherstellungskennwort senden"
 
   signup:
-#    create_account_title: "Create Account to Save Progress"
+    create_account_title: "Account anlegen, um Fortschritt zu speichern"
     description: "Es ist kostenlos. Nur noch ein paar Dinge, dann kannst Du loslegen."
     email_announcements: "Erhalte Benachrichtigungen per Email"
-    coppa: "Älter als 13 oder nicht in den USA"
+    coppa: "Älter als 13 oder nicht aus den USA"
     coppa_why: "(Warum?)"
     creating: "Erzeuge Account..."
     sign_up: "Neuen Account anlegen"
-    or: "oder "
     log_in: "mit Passwort einloggen"
 
   home:
@@ -73,7 +68,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     play: "Spielen"
 
   play:
-    choose_your_level: "Wähle Deinen Level"
+    choose_your_level: "Wähle dein Level"
     adventurer_prefix: "Du kannst zu jedem Level springen oder diskutiere die Level "
     adventurer_forum: "im Abenteurerforum"
     adventurer_suffix: "."
@@ -82,59 +77,57 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     campaign_dev: "Beliebiges schwierigeres Level"
     campaign_dev_description: "... in welchem Du die Bedienung erlernst, indem Du etwas schwierigeres machst."
     campaign_multiplayer: "Multiplayerarena"
-    campaign_multiplayer_description: "... in der Du in gegen einen anderen Spieler programmierst."
+    campaign_multiplayer_description: "... in der Du Kopf-an-Kopf gegen andere Spieler programmierst."
     campaign_player_created: "Von Spielern erstellt"
-    campaign_player_created_description: "... in welchem du gegen die Kreativität eines <a href=\"/contribute#artisan\">Artisan Zauberers</a> kämpfst."
-    level_difficulty: "Schwierigkeit:"
+    campaign_player_created_description: "... in welchem Du gegen die Kreativität eines <a href=\"/contribute#artisan\">Artisan Zauberers</a> kämpfst."
+    level_difficulty: "Schwierigkeit: "
 
   contact:
     contact_us: "Kontaktiere CodeCombat"
     welcome: "Schön von Dir zu hören! Benutze dieses Formular um uns eine Email zu schicken."
-    contribute_prefix: "Wenn Du Interesse hast, uns zu unterstützen dann sieh Dir die "
+    contribute_prefix: "Wenn Du Interesse hast, uns zu unterstützen dann sieh dir die "
     contribute_page: "Unterstützer Seite"
     contribute_suffix: " an!"
-    forum_prefix: "Für alle öffentlichen Themen, benutze "
+    forum_prefix: "Für alle öffentlichen Themen, benutze stattdessen "
     forum_page: "unser Forum"
-    forum_suffix: " stattdessen."
-    sending: "Sende..."
+    forum_suffix: "."
     send: "Sende Feedback"
 
   diplomat_suggestion:
     title: "Hilf CodeCombat zu übersetzen!"
     sub_heading: "Wir brauchen Deine Sprachfähigkeiten."
     pitch_body: "Wir entwickeln CodeCombat in Englisch, aber wir haben Spieler in der ganzen Welt. Viele von ihnen wollen in Deutsch spielen, sprechen aber kein Englisch. Wenn Du also beide Sprachen beherrscht, melde Dich an um ein Diplomat zu werden und hilf die Website und die Levels zu Deutsch zu übersetzen."
-    missing_translations: "Solange wir nicht alles zu Deutsch übesetzt haben siehst Du Englisch, wo Deutsch noch nicht zur Verfügung steht."
-    learn_more: "Finde heraus wie Du Diplomat werden kannst"
-    subscribe_as_diplomat: "Schreibe Dich als Diplomat ein"
+    missing_translations: "Solange wir nicht alles ins Deutsche übesetzt haben, siehst Du die englische Übersetzung, wo Deutsch leider noch nicht zur Verfügung steht."
+    learn_more: "Finde heraus, wie Du ein Diplomat werden kannst"
+    subscribe_as_diplomat: "Schreibe dich als Diplomat ein"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
+  wizard_settings:
+    title: "Zauberer Einstellungen"
+    customize_avatar: "Individualisiere deinen Avatar"
 
   account_settings:
     title: "Accounteinstellungen"
-    not_logged_in: "Logge Dich ein um einen Account anzulegen oder zu ändern."
+    not_logged_in: "Logge Dich ein oder lege einen Account an, um deine Einstellungen ändern zu können."
     autosave: "Sichere Änderungen automatisch"
     me_tab: "Ich"
     picture_tab: "Bild"
     wizard_tab: "Zauberer"
     password_tab: "Passwort"
     emails_tab: "Emails"
-    gravatar_select: "Wähle ein Gravatar Photo aus"
-    gravatar_add_photos: "Füge Vorschaubilder und Photos zu Deinem Gravatar Account hinzu für Deine email Bilder"
-    gravatar_add_more_photos: "Füge mehr Photos für Deinen Gravatar Account hinzu, um hier mehr Bilder wählen zu können"
+    gravatar_select: "Wähle ein Gravatar Bild aus"
+    gravatar_add_photos: "Füge Vorschaubilder und Fotos zu Deinem Gravatar Account (für Deine Email) hinzu, um ein Bild auswählen zu können"
+    gravatar_add_more_photos: "Füge mehr Fotos bei deinem Gravatar Account hinzu, um hier mehr Bilder wählen zu können"
     wizard_color: "Die Farbe der Kleidung des Zauberers"
     new_password: "Neues Passwort"
-    new_password_verify: "Verifizieren"
-    email_subscriptions: "Email Abonements"
+    new_password_verify: "Passwort verifizieren"
+    email_subscriptions: "Email Abonnements"
     email_announcements: "Ankündigungen"
-    email_announcements_description: "Bekomme die aktuellesten Nachrichten und Entwicklungen bei CodeCombat."
-    contributor_emails: "Untersützer Emails"
-    contribute_prefix: "Wir suchen nach Leuten, die mitmachen! Schau Dir die"
+    email_announcements_description: "Erhalte regelmäßig Mitteilungen für deinen Account."
+    contributor_emails: "Unterstützer Email"
+    contribute_prefix: "Wir suchen nach Leuten, die mitmachen! Schau dir die"
     contribute_page: "Unterstützer Seite"
     contribute_suffix: " an um mehr zu erfahren."
     email_toggle: "Alles wählen"
-    saving: "Speichere..."
     error_saving: "Fehler beim Speichern"
     saved: "Änderungen gespeichert"
     password_mismatch: "Passwörter stimmen nicht überein."
@@ -144,15 +137,15 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     profile_for_prefix: "Profil von "
 #    profile_for_suffix: ""
     profile: "Profil"
-    user_not_found: "Kein Nutzer gefunden. URL überprüfen?"
-    gravatar_not_found_mine: "Wir konnten das Profil nicht finden:"
+    user_not_found: "Kein Nutzer gefunden. URL überprüft?"
+    gravatar_not_found_mine: "Wir konnten dein Profil nicht finden, das mit folgender Email Adresse verbunden ist:"
 #    gravatar_not_found_email_suffix: "."
-    gravatar_signup_prefix: "Melde Dich an unter "
+    gravatar_signup_prefix: "Melde dich an unter "
     gravatar_signup_suffix: " um los zu legen!"
     gravatar_not_found_other: "Leider ist kein Profil mit der Email Adresse verknüpft."
     gravatar_contact: "Kontakt"
     gravatar_websites: "Websites"
-    gravatar_accounts: "Gesehen in"
+    gravatar_accounts: "Gesehen auf"
     gravatar_profile_link: "Gravatar Profil"
 
   play_level:
@@ -160,7 +153,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     done: "Fertig"
     grid: "Raster"
     customize_wizard: "Bearbeite den Zauberer"
-    home: "Home"
+    home: "Startseite"
     guide: "Hilfe"
     multiplayer: "Multiplayer"
     restart: "Neustart"
@@ -172,18 +165,18 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     reload_confirm: "Alles neu laden"
 #    victory_title_prefix: ""
     victory_title_suffix: " Abgeschlossen"
-    victory_sign_up: "Melde Dich an, um Updates zu erhalten"
-    victory_sign_up_poke: "Möchtest Du Neuigkeiten per Mail erhalten? Erzeuge einen kostenlosen Account und wir halten Dich auf dem Laufenden."
-    victory_rate_the_level: "Bewerte das Level:"
+    victory_sign_up: "Melde Dich an, um Fortschritte zu speichern"
+    victory_sign_up_poke: "Möchtest Du Neuigkeiten per Mail erhalten? Erstelle einen kostenlosen Account und wir halten Dich auf dem Laufenden."
+    victory_rate_the_level: "Bewerte das Level: "
     victory_play_next_level: "Spiel das nächste Level"
     victory_go_home: "Geh auf die Startseite"
     victory_review: "Erzähl uns davon!"
     victory_hour_of_code_done: "Bist Du fertig?"
     victory_hour_of_code_done_yes: "Ja, ich bin mit meiner Code-Stunde fertig!"
     multiplayer_title: "Multiplayer Einstellungen"
-    multiplayer_link_description: "Gib diesen Link jedem der mitmachen will."
+    multiplayer_link_description: "Gib diesen Link jedem, der mitmachen will."
     multiplayer_hint_label: "Hinweis:"
-    multiplayer_hint: " Klick den Link um alles auszuwählen, dann drück ⌘-C oder Strg-C um den Link zu kopieren."
+    multiplayer_hint: " Klick den Link, um alles auszuwählen, dann drück ⌘-C oder Strg-C um den Link zu kopieren."
     multiplayer_coming_soon: "Mehr Multiplayerfeatures werden kommen!"
     guide_title: "Anleitung"
     tome_minion_spells: "Die Zaubersprüche Deiner Knechte"
@@ -193,140 +186,124 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     tome_cast_button_casting: "Ausführen"
     tome_cast_button_cast: "Zauberspuch ausführen"
     tome_autocast_delay: "Verzögerung der automatischen Ausführung"
-    tome_autocast_1: "1 Sekunde"
-    tome_autocast_3: "3 Sekunden"
-    tome_autocast_5: "5 Sekunden"
-    tome_autocast_manual: "Manuell"
     tome_select_spell: "Wähle einen Zauber"
-    tome_select_a_thang: "Wähle jemanden aus um "
+    tome_select_a_thang: "Wähle jemanden aus, um "
     tome_available_spells: "Verfügbare Zauber"
-    hud_continue: "Weiter (drücke Enter)"
+    hud_continue: "Weiter (drücke Shift + Leertaste)"
+    spell_saved: "Zauber gespeichert"
 
-#  admin:
-#    av_title: "Admin Views"
-#    av_entities_sub_title: "Entities"
-#    av_entities_users_url: "Users"
-#    av_entities_active_instances_url: "Active Instances"
-#    av_other_sub_title: "Other"
+  admin:
+    av_title: "Administrator Übersicht"
+    av_entities_sub_title: "Entitäten"
+    av_entities_users_url: "Benutzer"
+    av_entities_active_instances_url: "Aktive Instanzen"
+    av_other_sub_title: "Sonstige"
 #    av_other_debug_base_url: "Base (for debugging base.jade)"
-#    u_title: "User List"
-#    lg_title: "Latest Games"
+    u_title: "Benutzerliste"
+    lg_title: "Letzte Spiele"
 
-#  editor:
-#    main_title: "CodeCombat Editors"
-#    main_description: "Build your own levels, campaigns, units and educational content. We provide all the tools you need!"
-#    article_title: "Article Editor"
-#    article_description: "Write articles that give players overviews of programming concepts which can be used across a variety of levels and campaigns."
+  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_description: "Build units, defining their default logic, graphics and audio. Currently only supports importing Flash exported vector graphics."
-#    level_title: "Level Editor"
-#    level_description: "Includes the tools for scripting, uploading audio, and constructing custom logic to create all sorts of levels. Everything we use ourselves!"
-#    security_notice: "Many major features in these editors are not currently enabled by default. As we improve the security of these systems, they will be made generally available. If you'd like to use these features sooner, "
-#    contact_us: "contact us!"
-#    hipchat_prefix: "You can also find us in our"
-#    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
-#    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
-#    level_tab_thangs: "Thangs"
-#    level_tab_scripts: "Scripts"
-#    level_tab_settings: "Settings"
-#    level_tab_components: "Components"
-#    level_tab_systems: "Systems"
-#    level_tab_thangs_title: "Current Thangs"
-#    level_tab_thangs_conditions: "Starting Conditions"
-#    level_tab_thangs_add: "Add Thangs"
-#    level_settings_title: "Settings"
-#    level_component_tab_title: "Current Components"
-#    level_component_btn_new: "Create New Component"
-#    level_systems_tab_title: "Current Systems"
-#    level_systems_btn_new: "Create New System"
-#    level_systems_btn_add: "Add System"
-#    level_components_title: "Back to All Thangs"
-#    level_components_type: "Type"
-#    level_component_edit_title: "Edit Component"
-#    level_system_edit_title: "Edit System"
-#    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
-#    new_component_title: "Create New Component"
-#    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
+    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!"
+    security_notice: "Viele Hauptfunktionen der Editoren sind standardmäßig noch nicht aktiviert. Sobald die Sicherheit dieser Systeme gewährleistet ist, werden sie generell freigeschaltet. Falls Du diese Funktionen früher nutzen möchtest, "
+    contact_us: "setze dich mit uns in Verbindung!" # kontaktiere uns!
+    hipchat_prefix: "Besuche uns auch in unserem"
+    hipchat_url: "HipChat room."
+    level_some_options: "Einige Einstellungsmöglichkeiten?"
+#    level_tab_thangs: "Thangs" # Things? # <= no Thangs are the components of the level. Check the editor if you're not sure what it is.
+#                                 rather dont't translate it
+    level_tab_scripts: "Skripte"
+    level_tab_settings: "Einstellungen"
+    level_tab_components: "Komponenten"
+    level_tab_systems: "Systeme"
+    level_tab_thangs_title: "Aktuelle Thangs"
+    level_tab_thangs_conditions: "Startbedingungen"
+    level_tab_thangs_add: "Thangs hinzufügen"
+    level_settings_title: "Einstellungen"
+    level_component_tab_title: "Aktuelle Komponenten"
+    level_component_btn_new: "neue Komponente erstellen"
+    level_systems_tab_title: "Aktuelle Systeme"
+    level_systems_btn_new: "neues System erstellen"
+    level_systems_btn_add: "System hinzufügen"
+    level_components_title: "Zurück zu allen Thangs"
+    level_components_type: "Typ"
+    level_component_edit_title: "Komponente bearbeiten"
+    level_system_edit_title: "System bearbeiten"
+    create_system_title: "neues System erstellen"
+    new_component_title: "Neue Komponente erstellen"
+    new_component_field_system: "System"
 
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
+  article:
+    edit_btn_preview: "Vorschau"
+    edit_article_title: "Artikel bearbeiten"
 
-#  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
-#    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
-#    edit_article_title: "Edit Article"
+  general:
+    and: "und"
+    name: "Name"
+    body: "Inhalt"
+    version: "Version"
+    commit_msg: "Commit Nachricht"
+    version_history_for: "Versionsgeschichte für: "
+    results: "Ergebnisse"
+    description: "Beschreibung"
+    email: "Email"
+    message: "Nachricht"
+    or: "oder"
 
-#  general:
-#    and: "and"
+  about:
+    who_is_codecombat: "Wer ist CodeCombat?" # Wer steckt hinter CodeCombat # behind
+    why_codecombat: "Warum CodeCombat?"
+    who_description_prefix: "gründeten CodeCombat im Jahre 2013 zusammen. Wir entwickelten außerdem "
+    who_description_suffix: ", die meist benutzte (#1) Web and iOS Applikation 2008 zum Lernen des Schreibens von chinesischen und japanischen Schriftzeichen." # need improvements
+    who_description_ending: "Nun ist es an der Zeit, den Leuten das Programmieren beizubringen."
+    why_paragraph_1: "Als er Skritter machte, wusste George nicht wie man programmiert und war permanent darüber frustriert, dass er seine Ideen nicht umsetzen konnte. Danach versuchte er es zu lernen, aber das ging ihm zu langsam. Sein Mitbewohner versuchte Codecademy, als er sich umorientierte und aufhörte zu lehren, aber \"langweilte sich\". Jede Woche begann ein neuer Freund mit Codecademy und ließ es dann wieder bleiben. Wir erkannten, dass es das gleiche Problem war, welches wir mit Skritter gelöst hatten: Leute lernen eine Fähigkeit mittels langsamer, intersiver Lerneinheiten, wobei sie schnelle, umfassende Übung bräuchten. Wir kennen Abhilfe."
+    why_paragraph_2: "Programmieren lernen? Du brauchst keine Stunden. Du musst einen Haufen Code schreiben und dabei Spaß haben."
+    why_paragraph_3_prefix: "Darum geht's beim Programmieren. Es soll Spaß machen. Nicht so einen Spaß wie"
+    why_paragraph_3_italic: "jau, 'ne Plakette"
+    why_paragraph_3_center: "sondern Spaß wie"
+    why_paragraph_3_italic_caps: "NEIN MUTTI ICH MUSS NOCH DEN LEVEL BEENDEN !"
+    why_paragraph_3_suffix: "Deshalb ist CodeCombat ein Multiplayerspiel und kein spielähnlicher Kurs. Wir werden nicht aufhören bis du nicht mehr aufhören kannst -- nur diesmal ist das eine gute Sache."
+    why_paragraph_4: "Wenn dich Spiele süchtig machen, dass lass dich von diesem süchtig machen und werde ein Zauberer des Technologiezeitalters."
+    why_ending: "Und hey, es kostet nichts. "
+    why_ending_url: "Beginne jetzt zu zaubern!"
+    george_description: "CEO, Businesstyp, Web Designer, Game Designer und Champion der Programmieranfänger überall."
+    scott_description: "Außergewöhnlicher Programmierer, Softwarearchitekt, Küchenzauberer und Finanzmeister. Scott ist der Vernünftige."
+    nick_description: "Programmierzauberer, exzentrischer Motivationskünstler und  Auf-den-Kopf-stell-Experimentierer. Nick könnte alles mögliche tun und entschied CodeCombat zu bauen."
+    jeremy_description: "Kundendienstmagier, Usability Tester und Community-Organisator. Wahrscheinlich hast du schon mit Jeremy gesprochen."
+    michael_description: "Programmierer, Systemadministrator und studentisch technisches Wunderkind, Michael hält unsere Server am Laufen."
 
-#  about:
-#    who_is_codecombat: "Who is CodeCombat?"
-#    why_codecombat: "Why CodeCombat?"
-#    who_description_prefix: "together started CodeCombat in 2013. We also created "
-#    who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters."
-#    who_description_ending: "Now it's time to teach people to write code."
-#    why_paragraph_1: "When making Skritter, George didn't know how to program and was constantly frustrated by his inability to implement his ideas. Afterwards, he tried learning, but the lessons were too slow. His housemate, wanting to reskill and stop teaching, tried Codecademy, but \"got bored.\" Each week another friend started Codecademy, then dropped off. We realized it was the same problem we'd solved with Skritter: people learning a skill via slow, intensive lessons when what they need is fast, extensive practice. We know how to fix that."
-#    why_paragraph_2: "Need to learn to code? You don't need lessons. You need to write a lot of code and have a great time doing it."
-#    why_paragraph_3_prefix: "That's what programming is about. It's gotta be fun. Not fun like"
-#    why_paragraph_3_italic: "yay a badge"
-#    why_paragraph_3_center: "but fun like"
-#    why_paragraph_3_italic_caps: "NO MOM I HAVE TO FINISH THE LEVEL!"
-#    why_paragraph_3_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing."
-#    why_paragraph_4: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age."
-#    why_ending: "And hey, it's free. "
-#    why_ending_url: "Start wizarding now!"
-#    george_description: "CEO, business guy, web designer, game designer, and champion of beginning programmers everywhere."
-#    scott_description: "Programmer extraordinaire, software architect, kitchen wizard, and master of finances. Scott is the reasonable one."
-#    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
-#    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
-#    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
-
-#  legal:
-#    page_title: "Legal"
-#    opensource_intro: "CodeCombat is free to play and completely open source."
-#    opensource_description_prefix: "Check out "
-#    github_url: "our GitHub"
-#    opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See "
-#    archmage_wiki_url: "our Archmage wiki"
-#    opensource_description_suffix: "for a list of the software that makes this game possible."
-#    practices_title: "Respectful Best Practices"
-#    practices_description: "These are our promises to you, the player, in slightly less legalese."
-#    privacy_title: "Privacy"
-#    privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent."
-#    security_title: "Security"
-#    security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems."
-#    email_title: "Email"
-#    email_description_prefix: "We will not inundate you with spam. Through"
-#    email_settings_url: "your email settings"
-#    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
-#    cost_title: "Cost"
-#    cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:"
-#    recruitment_title: "Recruitment"
-#    recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life."
-#    url_hire_programmers: "No one can hire programmers fast enough"
-#    recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you"
-#    recruitment_description_italic: "a lot"
-#    recruitment_description_ending: "the site remains free and everybody's happy. That's the plan."
+  legal:
+    page_title: "Rechtliches"
+    opensource_intro: "CodeCombat ist Free-to-Play und vollständig Open Source."
+    opensource_description_prefix: "Schau dir "
+    github_url: "unsere GitHub-Seite"
+    opensource_description_center: " an und mach mit wenn Du möchtest! CodeCombat baut auf duzenden Open Source Projekten auf, und wir lieben sie. Schau dir die Liste in "
+    archmage_wiki_url: "unserem Erzmagier-Wiki"
+    opensource_description_suffix: " an, welche Software dieses Spiel möglich macht."
+    practices_title: "Best Practices"
+    practices_description: "Dies sind unsere Versprechen an dich, den Spieler, in weniger Fachchinesisch."
+    privacy_title: "Datenschutz"
+    privacy_description: "Wir werden deine persönlichen Daten nicht verkaufen. Letztenendes beabsichtigen wir, durch Vermittlung von Jobs zu verdienen, aber sei versichert, dass wir nicht deine persönlichen Daten ohne deine ausdrückliche Einwilligung interessierten Firmen zur Verfügung stellen werden."
+    security_title: "Datensicherheit"
+    security_description: "Wir streben an, deine persönlichen Daten sicher zu verwahren. Als Open Source Projekt ist unsere Site frei zugänglich für jedermann, auch um unsere Sicherheitsmaßnahmen in Augenschein zu nehmen und zu verbessern."
+    email_title: "Email"
+    email_description_prefix: "Wir werden dich nicht mit Spam überschwemmen. Mittels"
+    email_settings_url: "deiner Emaileinstellungen"
+    email_description_suffix: "oder durch von uns gesendete Links kannst du jederzeit deine Einstellungen ändern und Abonnements kündigen."
+    cost_title: "Kosten"
+    cost_description: "CodeCombat ist zur Zeit 100% kostenlos! Eines unserer Hauptziele ist, es dabei zu belassen, so dass es so viele Leute wie möglich spielen können, unabhängig davon in welcher Lebenssituation sie sich befinden. Falls dunkle Wolken aufziehen, könnten wir manche Inhalte im Rahmen eines Abonnements anbieten, aber lieber nicht. Mit etwas Glück können wir die Firma erhalten durch:"
+    recruitment_title: "Recruiting"
+    recruitment_description_prefix: "Hier bei CodeCombat kannst du ein mächtiger Zauberer werden, nicht nur im Spiel, sondern auch in der Realität."
+    url_hire_programmers: "Niemand kann schnell genug Programmierer einstellen."
+    recruitment_description_suffix: "So wenn du deine Fähigkeiten entwickelt hast und zustimmst, werden wir deine besten Leistungen den tausenden Arbeitgebern demonstrieren, welche nur auf die Gelegentheit warten, dich einzustellen. Sie bezahlen uns ein bisschen, und sie bezahlen dir "
+    recruitment_description_italic: "jede Menge"
+    recruitment_description_ending: ", die Seite bleibt kostenlos und jeder ist glücklich. So der Plan."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"
@@ -446,18 +424,18 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    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: "Erzmagier"
+    archmage_title_description: "(Programmierer)"
+    artisan_title: "Handwerker"
+    artisan_title_description: "(Level Entwickler)"
+    adventurer_title: "Abenteurer"
+    adventurer_title_description: "(Level Spieltester)"
+    scribe_title: "Schreiber"
+    scribe_title_description: "(Artikel Editor)"
+    diplomat_title: "Diplomat"
+    diplomat_title_description: "(Übersetzer)"
+    ambassador_title: "Botschafter"
+    ambassador_title_description: "(Support)"
+    counselor_title: "Berater"
+    counselor_title_description: "(Experte/Lehrer)"

app/locale/el.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "ελληνικά", englishDescription: "Greek", translation:
   common:
     loading: "Φορτώνει..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Γίνεται αποθήκευση"
+    sending: "Αποστολή ..."
+    cancel: "Ακύρωση"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
   modal:
     close: "Κλείσε"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
     page_not_found: "Η σελίδα δεν βρέθηκε"
 
   nav:
-    sign_up: "Δημιούργησε Λογαριασμό"
-    log_in: "Σύνδεση"
-    log_out: "Αποσύνδεση"
 #    play: "Levels"
 #    editor: "Editor"
     blog: "Μπλόγκ"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
     twitter_follow: "Follow"
 #    employers: "Employers"
 
-  forms:
-    name: "Όνομα"
-    email: "Email "
-    message: "Μήνυμα"
-    cancel: "Ακύρωση"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,25 +42,23 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-#    log_in: "Log In"
-    sign_up: "Δημιουργήστε λογαριασμό"
-    or: "ή"
+    sign_up: "Δημιούργησε Λογαριασμό"
+    log_in: "Σύνδεση"
+    log_out: "Αποσύνδεση"
     recover: "Κάντε ανάκτηση του λογαριασμού σας"
 
-#  recover:
-#    recover_account_title: "Recover Account"
+  recover:
+    recover_account_title: "Κάντε ανάκτηση του λογαριασμού σας"
 #    send_password: "Send Recovery Password"
 
   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:"
+    description: "Είναι δωρεάν. Απλώς χρειάζεται να έχεις έναν λογαριασμό και θα είσαι έτοιμος να παίξεις:"
     email_announcements: "Λαμβάνετε ανακοινώσεις μέσω e-mail"
-#    coppa: "13+ or non-USA "
+    coppa: "13+ ή Εκτός Αμερικής "
     coppa_why: "(Γιάτι?)"
     creating: "Δημιουργία λογαριασμού"
     sign_up: "Εγγραγή"
-    or: "ή"
     log_in: "Σύνδεση με κώδικο"
 
   home:
@@ -77,35 +72,34 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
     adventurer_prefix: "Μπορείτε να μεταβείτε σε οποιοδήποτε επίπεδο κάτω, ή να  συζητήσετε για τις πίστες στο "
     adventurer_forum: "Φόρουμ του \"Τυχοδιώκτη\""
 #    adventurer_suffix: ""
-#    campaign_beginner: "Beginner Campaign"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
+    campaign_beginner: "Εκστρατεία για Αρχάριους"
+    campaign_beginner_description: "... στο οποίο μπορείτε να μάθετε τη μαγεία του προγραμματισμού"
+    campaign_dev: "Τυχαία δυσκολότερα επίπεδα"
+    campaign_dev_description: "... στο οποίο μπορείτε να μάθετε το περιβάλλον, ενώ κάνετε κάτι λίγο πιο δύσκολο."
+    campaign_multiplayer: "Αρένες Πολλαπλών Παικτών"
+    campaign_multiplayer_description: "... στο οποίο μπορείτε να προγραμματίσετε σώμα με σώμα έναντι άλλων παικτών."
 #    campaign_player_created: "Player-Created"
 #    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
     level_difficulty: "Δυσκολία: "
 
-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
-#    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
-#    forum_suffix: " instead."
-#    sending: "Sending..."
-#    send: "Send Feedback"
+  contact:
+    contact_us: "Επικοινωνήστε μαζί μας"
+    welcome: "Καλό να ακούσω από εσάς! Χρησιμοποιήστε αυτή τη φόρμα για να μας στείλετε email. "
+    contribute_prefix: "Αν σας ενδιαφέρει να βοηθήσετε, ελέγξτε την "
+    contribute_page: "σελίδα συνεισφοράς"
+    contribute_suffix: "!"
+    forum_prefix: "Για οτιδήποτε δημόσιο, δοκίμασε "
+    forum_page: "το φόρουμ μας"
+ #   forum_suffix: " instead."
+    send: "Αποστολή σχολίων"
 
   diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Greek 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 Greek."
-    missing_translations: "Until we can translate everything into Greek, you'll see English when Greek isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    title: "Βοηθήστε στην μετάφραση CodeCombat!"
+    sub_heading: "Χρειαζόμαστε τις γλωσσικές σας δεξιότητες."
+    pitch_body: "Αναπτύσσουμε το CodeCombat στα αγγλικά, αλλά ήδη έχουμε παίκτες από όλο τον κόσμο. Πολλοί από αυτούς θέλουν να παίξουν στα αγγλικά, αλλά δεν μιλούν αγγλικά, οπότε αν μπορείτε να μιλήσετε και τις δύο, παρακαλούμε να Αναπτύσσουμε CodeCombat στα αγγλικά, αλλά ήδη έχουμε παίκτες σε όλο τον κόσμο. Πολλοί από αυτούς θέλουν να παίξουν στα Ελληνικά, αλλά δεν μιλούν αγγλικά, οπότε αν μπορείτε να μιλήσετε και τις δύο γλώσσες, παρακαλούμε να σκεφτείτε την εγγραφή ως ένας Διπλωμάτης και βοηθήστε να μεταφραστεί τόσο η ιστοσελίδα CodeCombat και όλα τα επίπεδα στην Ελληνική γλώσσα."
+    missing_translations: "Μέχρι να μπορούν να μεταφράσουν τα πάντα σε Ελληνικά, θα δείτε την αγγλική γλώσσα όπου τα Ελληνικά  δεν είναι διαθέσιμα."
+    learn_more: "Μάθετε περισσότερα σχετικά με το να είστε ένας Διπλωμάτης"
+    subscribe_as_diplomat: "Εγγραφή ως Διπλωμάτης"
 
 #  wizard_settings:
 #    title: "Wizard Settings"
@@ -121,86 +115,83 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
     password_tab: "Κωδικός"
     emails_tab: "Emails"
     gravatar_select: "Επέλεξε φωτογραφία \"Gravatar\" για να χρησιμοποιήσεις"
-#    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
-#    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
-#    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
-#    contributor_emails: "Contributor Class Emails"
-#    contribute_prefix: "We're looking for people to join our party! Check out the "
-#    contribute_page: "contribute page"
-#    contribute_suffix: " to find out more."
-#    email_toggle: "Toggle All"
-#    saving: "Saving..."
-#    error_saving: "Error Saving"
-#    saved: "Changes Saved"
-#    password_mismatch: "Password does not match."
+    gravatar_add_photos: "Πρόσθεσε μικρογραφίες και φωτογραφίες σε έναν λογαριασμό \"Gravatar\" για το email σου διάλεξε μια φωτογραφία"
+    gravatar_add_more_photos: "Προσθέστε περισσότερες φωτογραφίες στο Gravatar λογαριασμό σας για να αποκτήσετε πρόσβαση σε αυτά από εδώ."
+    wizard_color: "Χρώμα ρούχων του Μάγου"
+    new_password: "Καινούργιος Κωδικός"
+    new_password_verify: " Επαλήθευση  Κωδικού"
+    email_subscriptions: "Συνδρομές Email"
+    email_announcements: "Ανακοινώσεις"
+#    email_notifications_description: "Get periodic notifications for your account."
+#    email_announcements_description: "Λάβετε emails για τα τελευταία νέα και τις εξελίξεις του CodeCombat."
+    contributor_emails: "Contributor Class Emails"
+    contribute_prefix: "Αναζητούμε για ανθρώπους που θέλουν να  "
+    contribute_page: "Σελίδα συνεισφοράς"
+    contribute_suffix: " μάθε περισσότερα"
+    email_toggle: "Επέλεξα όλα"
+    error_saving: "Σφάλμα αποθήκευσης"
+    saved: "Οι αλλαγές αποθηκεύτηκαν"
+    password_mismatch: "Οι κωδικοί δεν ταιριάζουν"
 
-#  account_profile:
-#    edit_settings: "Edit Settings"
-#    profile_for_prefix: "Profile for "
+  account_profile:
+    edit_settings: "Επεξεργασία ρυθμίσεων"
+    profile_for_prefix: "Προφίλ για "
 #    profile_for_suffix: ""
-#    profile: "Profile"
+    profile: "Προφίλ"
 #    user_not_found: "No user found. Check the URL?"
-#    gravatar_not_found_mine: "We couldn't find your profile associated with:"
-#    gravatar_not_found_email_suffix: "."
-#    gravatar_signup_prefix: "Sign up at "
+    gravatar_not_found_mine: " Δε μπορέσαμε να βρούμε το προφίλ σας που σχετίζετε με:"
+    gravatar_not_found_email_suffix: "."
+    gravatar_signup_prefix: "Εγγραφή στο "
 #    gravatar_signup_suffix: " to get set up!"
-#    gravatar_not_found_other: "Alas, there's no profile associated with this person's email address."
-#    gravatar_contact: "Contact"
-#    gravatar_websites: "Websites"
-#    gravatar_accounts: "As Seen On"
-#    gravatar_profile_link: "Full Gravatar Profile"
+    gravatar_not_found_other: "Αλίμονο, δεν υπάρχει προφίλ που σχετίζεται με αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου του προσώπου αυτού."
+    gravatar_contact: "Επικοινωνία"
+    gravatar_websites: "Ιστοσελίδες"
+    gravatar_accounts: "Όπως φαίνεται στην"
+    gravatar_profile_link: "Πλήρη προφίλ \"Gravatar\""
 
-#  play_level:
-#    level_load_error: "Level could not be loaded."
-#    done: "Done"
-#    grid: "Grid"
-#    customize_wizard: "Customize Wizard"
-#    home: "Home"
-#    guide: "Guide"
-#    multiplayer: "Multiplayer"
+  play_level:
+    level_load_error: "Το επίπεδο δεν μπόρεσε να φορτωθεί"
+    done: "Έτοιμο"
+    grid: "Πλέγμα"
+    customize_wizard: "Προσαρμόστε τον Μάγο"
+    home: "Αρχική"
+    guide: "Οδηγός"
+    multiplayer: "Πολλαπλοί παίχτες"
 #    restart: "Restart"
-#    goals: "Goals"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
-#    reload_title: "Reload All Code?"
-#    reload_really: "Are you sure you want to reload this level back to the beginning?"
-#    reload_confirm: "Reload All"
+    goals: "Στόχοι"
+    action_timeline: "Χρονοδιάγραμμα δράσης"
+    click_to_select: "Κάντε κλικ σε μια μονάδα για να το επιλέξετε."
+    reload_title: "Ανανέωση όλου του κωδικά;"
+    reload_really: "Είστε σίγουροι ότι θέλετε να φορτώσετε αυτό το επίπεδο από την αρχή;"
+    reload_confirm: "Ανανέωση όλων"
 #    victory_title_prefix: ""
 #    victory_title_suffix: " Complete"
-#    victory_sign_up: "Sign Up to Save Progress"
-#    victory_sign_up_poke: "Want to save your code? Create a free account!"
-#    victory_rate_the_level: "Rate the level: "
-#    victory_play_next_level: "Play Next Level"
-#    victory_go_home: "Go Home"
-#    victory_review: "Tell us more!"
-#    victory_hour_of_code_done: "Are You Done?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code!"
-#    multiplayer_title: "Multiplayer Settings"
-#    multiplayer_link_description: "Give this link to anyone to have them join you."
-#    multiplayer_hint_label: "Hint:"
-#    multiplayer_hint: " Click the link to select all, then press ⌘-C or Ctrl-C to copy the link."
-#    multiplayer_coming_soon: "More multiplayer features to come!"
-#    guide_title: "Guide"
-#    tome_minion_spells: "Your Minions' Spells"
-#    tome_read_only_spells: "Read-Only Spells"
-#    tome_other_units: "Other Units"
-#    tome_cast_button_castable: "Cast"
+    victory_sign_up: "Εγγραφείτε για ενημερώσεις"
+    victory_sign_up_poke: "Θέλετε να λαμβάνετε τα τελευταία νέα μέσω e-mail; Δημιουργήστε έναν δωρεάν λογαριασμό και θα σας κρατάμε ενήμερους!"
+    victory_rate_the_level: "Βαθμολογήστε το επίπεδο: "
+    victory_play_next_level: "Παίξε το επόμενο επίπεδο"
+    victory_go_home: "Πηγαίνετε στην Αρχική"
+    victory_review: "Πείτε μας περισσότερα!"
+    victory_hour_of_code_done: "Τελείωσες;"
+    victory_hour_of_code_done_yes: "Ναι, έχω τελειώσει με την Hour of Code!"
+    multiplayer_title: "Ρυθμίσεις multiplayer"
+    multiplayer_link_description: "Δώστε αυτό τον τον σύνδεσμο σε οποιονδήποτε για να ενταχθούν στο παιχνίδι σου."
+    multiplayer_hint_label: "Συμβουλή:"
+    multiplayer_hint: " Κάντε κλικ στο σύνδεσμο για να επιλέξετε όλα, στη συνέχεια, πατήστε την Apple-C ή Ctrl-C για να αντιγράψετε το σύνδεσμο."
+    multiplayer_coming_soon: "Περισσότερα multiplayer χαρακτιριστηκα προσεχως!"
+    guide_title: "Οδηγός"
+    tome_minion_spells: "Ξόρκια για τα τσιράκια σας"
+    tome_read_only_spells: "Ξορκια μονο για αναγνωση"
+    tome_other_units: "Άλλες μονάδες"
+    tome_cast_button_castable: "Μαγεψε"
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+    name: "Όνομα"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    or: "ή"
+    email: "Email "
+    message: "Μήνυμα"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/en-AU.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
 #  diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/en-GB.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
 #  diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/en-US.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
 #  diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/en.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     loading: "Loading..."
     saving: "Saving..."
     sending: "Sending..."
+    cancel: "Cancel"
+    save: "Save"
+    delay_1_sec: "1 second"
+    delay_3_sec: "3 seconds"
+    delay_5_sec: "5 seconds"
+    manual: "Manual"
+    fork: "Fork"
+    play: "Play"
 
   modal:
     close: "Close"
@@ -12,16 +20,11 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     page_not_found: "Page not found"
 
   nav:
-    # Header
-    sign_up: "Create Account"
-    log_in: "Log In"
-    log_out: "Log Out"
     play: "Levels"
     editor: "Editor"
     blog: "Blog"
     forum: "Forum"
     admin: "Admin"
-    # Footer
     home: "Home"
     contribute: "Contribute"
     legal: "Legal"
@@ -30,16 +33,8 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     twitter_follow: "Follow"
     employers: "Employers"
 
-  forms:
-    name: "Name"
-    email: "Email"
-    message: "Message"
-    cancel: "Cancel"
-    save: "Save"
-
   versions:
     save_version_title: "Save New Version"
-    commit_message: "Commit Message"
     new_major_version: "New Major Version"
     cla_prefix: "To save changes, first you must agree to our"
     cla_url: "CLA"
@@ -47,10 +42,9 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     cla_agree: "I AGREE"
 
   login:
-    login_modal_title: "Log In"
+    sign_up: "Create Account"
     log_in: "Log In"
-    sign_up: "create new account"
-    or: ", or "
+    log_out: "Log Out"
     recover: "recover account"
 
   recover:
@@ -65,7 +59,6 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     coppa_why: "(Why?)"
     creating: "Creating Account..."
     sign_up: "Sign Up"
-    or: "or "
     log_in: "log in with password"
 
   home:
@@ -98,7 +91,6 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     forum_prefix: "For anything public, please try "
     forum_page: "our forum"
     forum_suffix: " instead."
-    sending: "Sending..."
     send: "Send Feedback"
 
   diplomat_suggestion:
@@ -130,13 +122,13 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     new_password_verify: "Verify"
     email_subscriptions: "Email Subscriptions"
     email_announcements: "Announcements"
+    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
     contributor_emails: "Contributor Class Emails"
     contribute_prefix: "We're looking for people to join our party! Check out the "
     contribute_page: "contribute page"
     contribute_suffix: " to find out more."
     email_toggle: "Toggle All"
-    saving: "Saving..."
     error_saving: "Error Saving"
     saved: "Changes Saved"
     password_mismatch: "Password does not match."
@@ -195,10 +187,6 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     tome_cast_button_casting: "Casting"
     tome_cast_button_cast: "Spell Cast"
     tome_autocast_delay: "Autocast Delay"
-    tome_autocast_1: "1 second"
-    tome_autocast_3: "3 seconds"
-    tome_autocast_5: "5 seconds"
-    tome_autocast_manual: "Manual"
     tome_select_spell: "Select a Spell"
     tome_select_a_thang: "Select Someone for "
     tome_available_spells: "Available Spells"
@@ -228,14 +216,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     contact_us: "contact us!"
     hipchat_prefix: "You can also find us in our"
     hipchat_url: "HipChat room."
-    level_btn_save: "Save"
-    level_btn_fork: "Fork"
-    level_btn_play: "Play"
     level_some_options: "Some Options?"
-    level_options_1_second: "1 second"
-    level_options_3_seconds: "3 seconds"
-    level_options_5_seconds: "5 seconds"
-    level_options_manual: "Manual"
     level_tab_thangs: "Thangs"
     level_tab_scripts: "Scripts"
     level_tab_settings: "Settings"
@@ -255,32 +236,25 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     level_component_edit_title: "Edit Component"
     level_system_edit_title: "Edit System"
     create_system_title: "Create New System"
-    create_system_field_name: "Name"
-    create_system_btn_cancel: "Cancel"
-    create_system_btn_create: "Create"
     new_component_title: "Create New Component"
     new_component_field_system: "System"
-    new_component_field_name: "Name"
-    new_component_btn_cancel: "Cancel"
-    new_component_btn_create: "Create"
-
-  level:
-    index_table_results: "Results"
-    index_table_name: "Name"
-    index_table_description: "Description"
-    index_table_version: "Version"
 
   article:
-    index_table_results: "Results"
-    index_table_name: "Name"
-    index_table_body: "Body"
-    index_table_version: "Version"
     edit_btn_preview: "Preview"
-    edit_btn_save: "Save"
     edit_article_title: "Edit Article"
 
   general:
     and: "and"
+    name: "Name"
+    body: "Body"
+    version: "Version"
+    commit_msg: "Commit Message"
+    version_history_for: "Version History for: "
+    results: "Results"
+    description: "Description"
+    or: "or"
+    email: "Email"
+    message: "Message"
 
   about:
     who_is_codecombat: "Who is CodeCombat?"
@@ -367,6 +341,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
 
   contribute:
     page_title: "Contributing"
+    character_classes_title: "Character Classes"
     introduction_desc_intro: "We have high hopes for CodeCombat."
     introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
     introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/es-419.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "español (América Latina)", englishDescription: "Spanish (Latin America)", translation:
   common:
     loading: "Cargando..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Guardando..."
+    sending: "Enviando..."
+    cancel: "Cancelar"
+#    save: "Save"
+    delay_1_sec: "1 segundo"
+    delay_3_sec: "3 segundos"
+    delay_5_sec: "5 segundos"
+    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
   modal:
     close: "Cerrar"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     page_not_found: "Pagina no encontrada"
 
   nav:
-    sign_up: "Crear Cuenta"
-    log_in: "Entrar"
-    log_out: "Salir"
     play: "Jugar"
     editor: "Editor"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     twitter_follow: "Seguir"
 #    employers: "Employers"
 
-  forms:
-    name: "Nombre"
-    email: "Email"
-    message: "Mensaje"
-    cancel: "Cancelar"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,14 +42,13 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "Iniciar sesión"
-    sign_up: "crear nueva cuenta"
-    or: ", o "
+    sign_up: "Crear Cuenta"
+    log_in: "Entrar"
+    log_out: "Salir"
     recover: "recuperar cuenta"
 
-#  recover:
-#    recover_account_title: "Recover Account"
+  recover:
+    recover_account_title: "recuperar cuenta"
 #    send_password: "Send Recovery Password"
 
   signup:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     coppa_why: "(¿Por qué?)"
     creating: "Creando Cuenta..."
     sign_up: "Registrarse"
-    or: "o "
     log_in: "Inicia sesión con tu contraseña"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     forum_prefix: "Para cualquier cosa pública, por favor prueba "
     forum_page: "nuestro foro"
     forum_suffix: "en su lugar."
-    sending: "Enviando..."
     send: "Enviar Comentario"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     new_password_verify: "Verificar"
     email_subscriptions: "Suscripciones de Email"
     email_announcements: "Noticias"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Recibe correos electrónicos con las últimas noticias y desarrollos de CodeCombat."
     contributor_emails: "Emails Clase Contribuyente"
     contribute_prefix: "¡Estamos buscando gente que se una a nuestro grupo! Echa un vistazo a la "
     contribute_page: "página de contribución"
     contribute_suffix: "para averiguar más."
     email_toggle: "Activar Todo"
-    saving: "Guardando..."
     error_saving: "Error al Guardar"
     saved: "Cambios Guardados"
     password_mismatch: "La contraseña no coincide."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     tome_cast_button_casting: "Invocando"
     tome_cast_button_cast: "Invocar"
     tome_autocast_delay: "Demora de Autolanzamiento"
-    tome_autocast_1: "1 segundo"
-    tome_autocast_3: "3 segundos"
-    tome_autocast_5: "5 segundos"
-    tome_autocast_manual: "Manual"
     tome_select_spell: "Selecciona un Hechizo"
     tome_select_a_thang: "Selecciona Alguien para "
     tome_available_spells: "Hechizos Disponibles"
     hud_continue: "Continuar (presionar shift+space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+    or: "o"
+    name: "Nombre"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Email"
+    message: "Mensaje"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/es-ES.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "español (ES)", englishDescription: "Spanish (Spain)", translation:
   common:
     loading: "Cargando..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Guardando..."
+    sending: "Enviando..."
+    cancel: "Cancelar"
+    save: "Guardar"
+    delay_1_sec: "1 segundo"
+    delay_3_sec: "3 segundos"
+    delay_5_sec: "5 segundos"
+    manual: "Manual"
+    fork: "Bifurcar"
+    play: "Jugar"
 
   modal:
     close: "Cerrar"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     page_not_found: "Página no encontrada"
 
   nav:
-    sign_up: "Crear una cuenta"
-    log_in: "Entrar"
-    log_out: "Salir"
     play: "Jugar"
     editor: "Editor"
     blog: "Blog"
@@ -26,44 +31,34 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     about: "Sobre nosotros"
     contact: "Contacta"
     twitter_follow: "Síguenos"
-#    employers: "Employers"
+    employers: "Empresas"
 
-  forms:
-    name: "Nombre"
-    email: "Correo electrónico"
-    message: "Mensaje"
-    cancel: "Cancelar"
-#    save: "Save"
-
-#  versions:
-#    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+  versions:
+    save_version_title: "Guardar nueva versión"
+    new_major_version: "Nueva versión principal"
+    cla_prefix: "Para guardar los cambios, primero debes aceptar nuestro"
+    cla_url: "CLA"
+    cla_suffix: "."
+    cla_agree: "De acuerdo"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "Iniciar sesión"
-    sign_up: "crear una nueva cuenta"
-    or: ", o "
+    sign_up: "Crear una cuenta"
+    log_in: "Entrar"
+    log_out: "Salir"
     recover: "recuperar cuenta"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "recuperar cuenta"
+    send_password: "Enviar recuperación de contraseña"
 
   signup:
-#    create_account_title: "Create Account to Save Progress"
+    create_account_title: "Crea una cuenta para guardar tu progreso"
     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"
-    or: "o "
     log_in: "Iniciar sesión con contraseña"
 
   home:
@@ -75,41 +70,40 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
   play:
     choose_your_level: "Elige tu nivel"
     adventurer_prefix: "Puedes elegir cualquier pantalla o charlar en "
-    adventurer_forum: "el foro del aventurero"
+    adventurer_forum: "el foro del aventurero "
     adventurer_suffix: "sobre ello."
     campaign_beginner: "Campaña de Principiante"
     campaign_beginner_description: "... en la que aprenderás la magia de la programación."
     campaign_dev: "Niveles aleatorios más dificiles"
-    campaign_dev_description: "... en la que aprenderás sobre la interfaz mientras haces algo más difícil."
+    campaign_dev_description: "... en los que aprenderás sobre la interfaz mientras haces algo más difícil."
     campaign_multiplayer: "Arenas Multijugador"
     campaign_multiplayer_description: "... en las que tu código se enfrentará al de otros jugadores."
     campaign_player_created: "Creaciones de los Jugadores"
-    campaign_player_created_description: "... en la que luchas contra la creatividad de tus compañeros <a href=\"/contribute#artisa\">Magos Artesanos</a>."
+    campaign_player_created_description: "... en las que luchas contra la creatividad de tus compañeros <a href=\"/contribute#artisa\">Magos Artesanos</a>."
     level_difficulty: "Dificultad: "
 
   contact:
     contact_us: "Contacta con CodeCombat"
-    welcome: "¡Nos gusta saber de ti! Usa este formulario para enviarnos un correo."
+    welcome: "¡Nos gusta saber de ti! Usa este formulario para enviarnos un correo. "
     contribute_prefix: "Si estás interesado en colaborar, ¡échale un vistazo a nuestra "
     contribute_page: "página de contribuciones"
     contribute_suffix: "!"
-    forum_prefix: "Para cosas públicos, por favor usa "
+    forum_prefix: "Para asuntos públicos, por favor usa "
     forum_page: "nuestro foro"
     forum_suffix: " en su lugar."
-    sending: "Enviando..."
     send: "Envía tu comentario"
 
   diplomat_suggestion:
     title: "¡Ayuda a traducir CodeCombat!"
     sub_heading: "Necesitamos tus habilidades lingüisticas."
-    pitch_body: "Nosotros desarrollamos CodeCombat en inglés, pero ya tenemos jugadores de todo el mundo. Muchos de ellos quieren jugar en Español porque no hablan inglés, así quesi hablas ambos idiomas, inscríbete como Diplomático y ayuda a traducir la web y todos los niveles de CodeCombat al Español."
-    missing_translations: "Mientras terminamos la traducción al Español, verás en inglés las partes que no estén todavía disponibles."
+    pitch_body: "Nosotros desarrollamos CodeCombat en inglés, pero ya tenemos jugadores de todo el mundo. Muchos de ellos quieren jugar en español porque no hablan inglés, así que si hablas ambos idiomas, inscríbete como Diplomático y ayuda a traducir la web y todos los niveles de CodeCombat al español."
+    missing_translations: "Mientras terminamos la traducción al español, verás en inglés las partes que no estén todavía disponibles."
     learn_more: "Aprende más sobre ser un Diplomático"
     subscribe_as_diplomat: "Suscríbete como Diplomático"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
+  wizard_settings:
+    title: "Ajustes del mago"
+    customize_avatar: "Personaliza tu Avatar"
 
   account_settings:
     title: "Ajustes de la cuenta"
@@ -124,17 +118,17 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     gravatar_add_photos: "Añade fotos a la cuenta de Gravatar asociada a tu correo electrónico para elegir la imagen."
     gravatar_add_more_photos: "Añade más fotos a tu cuenta de Gravatar para tener acceso a ellas aquí."
     wizard_color: "Color de la ropa del Mago"
-    new_password: "Nuevo contraseña"
+    new_password: "Nueva contraseña"
     new_password_verify: "Verificar"
     email_subscriptions: "Suscripciones de correo electrónico"
     email_announcements: "Noticias"
+    email_notifications_description: "Recibe notificaciones periódicas en tu cuenta."
     email_announcements_description: "Recibe correos electrónicos con las últimas noticias y desarrollos de CodeCombat."
     contributor_emails: "Correos para colaboradores"
     contribute_prefix: "¡Buscamos gente que se una a nuestro comunidad! Comprueba la "
     contribute_page: "página de colaboraciones"
     contribute_suffix: " para saber más."
     email_toggle: "Activar todo"
-    saving: "Guardando..."
     error_saving: "Error al guardar"
     saved: "Cambios guardados"
     password_mismatch: "La contraseña no coincide"
@@ -145,15 +139,15 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    profile_for_suffix: ""
     profile: "Perfil"
     user_not_found: "No se encontró al usuario. ¿Comprueba la URL?"
-    gravatar_not_found_mine: "No podemos encontrar el prefil asociado con:"
+    gravatar_not_found_mine: "No podemos encontrar el perfil asociado con:"
 #    gravatar_not_found_email_suffix: "."
-    gravatar_signup_prefix: "Suscribete "
+    gravatar_signup_prefix: "¡Suscribete a "
     gravatar_signup_suffix: " para ponerte en marcha!"
     gravatar_not_found_other: "Vaya, no hay un perfil asociado a la dirección de correo electrónico de esta persona."
     gravatar_contact: "Contacto"
     gravatar_websites: "Paginas web"
-    gravatar_accounts: "Como se vé en"
-    gravatar_profile_link: "Prefil de Gravatar completo"
+    gravatar_accounts: "Como se ve en"
+    gravatar_profile_link: "Perfil de Gravatar completo"
 
   play_level:
     level_load_error: "No se pudo cargar el nivel."
@@ -193,271 +187,255 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     tome_cast_button_casting: "Invocando"
     tome_cast_button_cast: "Invocar"
     tome_autocast_delay: "Retardo de autoinvocación"
-    tome_autocast_1: "1 segundo"
-    tome_autocast_3: "3 segundos"
-    tome_autocast_5: "5 segundos"
-    tome_autocast_manual: "Manual"
     tome_select_spell: "Selecciona un Hechizo"
     tome_select_a_thang: "Selecciona a alguien para "
     tome_available_spells: "Hechizos disponibles"
     hud_continue: "Continuar (pulsa Shift+Space)"
+    spell_saved: "Hechizo guardado"
 
 #  admin:
-#    av_title: "Admin Views"
-#    av_entities_sub_title: "Entities"
-#    av_entities_users_url: "Users"
-#    av_entities_active_instances_url: "Active Instances"
-#    av_other_sub_title: "Other"
-#    av_other_debug_base_url: "Base (for debugging base.jade)"
-#    u_title: "User List"
-#    lg_title: "Latest Games"
+    av_title: "Vista de Administrador"
+    av_entities_sub_title: "Entidades"
+    av_entities_users_url: "Usuarios"
+    av_entities_active_instances_url: "Instancias Activas"
+    av_other_sub_title: "Otras"
+    av_other_debug_base_url: "Base (para depurar base.jade)"
+    u_title: "Lista de Usuario"
+    lg_title: "Últimos juegos"
 
-#  editor:
-#    main_title: "CodeCombat Editors"
-#    main_description: "Build your own levels, campaigns, units and educational content. We provide all the tools you need!"
-#    article_title: "Article Editor"
-#    article_description: "Write articles that give players overviews of programming concepts which can be used across a variety of levels and campaigns."
-#    thang_title: "Thang Editor"
-#    thang_description: "Build units, defining their default logic, graphics and audio. Currently only supports importing Flash exported vector graphics."
-#    level_title: "Level Editor"
-#    level_description: "Includes the tools for scripting, uploading audio, and constructing custom logic to create all sorts of levels. Everything we use ourselves!"
-#    security_notice: "Many major features in these editors are not currently enabled by default. As we improve the security of these systems, they will be made generally available. If you'd like to use these features sooner, "
-#    contact_us: "contact us!"
-#    hipchat_prefix: "You can also find us in our"
-#    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
-#    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
-#    level_tab_thangs: "Thangs"
-#    level_tab_scripts: "Scripts"
-#    level_tab_settings: "Settings"
-#    level_tab_components: "Components"
-#    level_tab_systems: "Systems"
-#    level_tab_thangs_title: "Current Thangs"
-#    level_tab_thangs_conditions: "Starting Conditions"
-#    level_tab_thangs_add: "Add Thangs"
-#    level_settings_title: "Settings"
-#    level_component_tab_title: "Current Components"
-#    level_component_btn_new: "Create New Component"
-#    level_systems_tab_title: "Current Systems"
-#    level_systems_btn_new: "Create New System"
-#    level_systems_btn_add: "Add System"
-#    level_components_title: "Back to All Thangs"
-#    level_components_type: "Type"
-#    level_component_edit_title: "Edit Component"
-#    level_system_edit_title: "Edit System"
-#    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
-#    new_component_title: "Create New Component"
-#    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
+  editor:
+    main_title: "Editores de CodeCombat"
+    main_description: "Construye tus propios niveles, campañas, unidades y contenido educativo. ¡Nosotros te ofrecemos todas las herramientas que necesitas!"
+    article_title: "Editor de artículos"
+    article_description: "Escribe artículos que den a los jugadores una visión general de los conceptos de programación que se pueden utilizar a lo largo de una gran variedad de niveles y campañas."
+    thang_title: "Editor de Objetos"
+    thang_description: "Construye unidades, su lógica predeterminada, gráficos y audio. Actualmente sólo se permite importar gráficos vectoriales exportados de Flash."
+    level_title: "Editor de Niveles"
+    level_description: "Incluye las herramientas para escribir scripts, subir audio, y construir una lógica personalidad con la que crear todo tipo de niveles. ¡Todo lo que usamos nosotros!"
+    security_notice: "Muchas de las funciones principales de estos editores no están habilitadas todavía por defecto. A medida que mejoremos la seguridad de los sistemas, se irán poniendo a disposición de todos. Si quieres utilizar estas funciones antes, "
+    contact_us: "¡Contacta con nosotros!"
+    hipchat_prefix: "También puedes encontrarnos en nuestra"
+    hipchat_url: "sala de HipChat."
+    level_some_options: "¿Algunas opciones?"
+    level_tab_thangs: "Objetos"
+    level_tab_scripts: "Scripts"
+    level_tab_settings: "Ajustes"
+    level_tab_components: "Componentes"
+    level_tab_systems: "Sistemas"
+    level_tab_thangs_title: "Objetos actuales"
+    level_tab_thangs_conditions: "Condiciones de inicio"
+    level_tab_thangs_add: "Añadir Objetos"
+    level_settings_title: "Ajustes"
+    level_component_tab_title: "Componentes Actuales"
+    level_component_btn_new: "Crear Nuevo Componente"
+    level_systems_tab_title: "Sistemas Actuales"
+    level_systems_btn_new: "Crear Nuevo Sistema"
+    level_systems_btn_add: "Añadir Sistema"
+    level_components_title: "Volver a Todos los Objetos"
+    level_components_type: "Tipo"
+    level_component_edit_title: "Editar Componente"
+    level_system_edit_title: "Editar Sistema"
+    create_system_title: "Crear Nuevo Sistema"
+    new_component_title: "Crear Nuevo Componente"
+    new_component_field_system: "Sistema"
 
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
+  article:
+    edit_btn_preview: "Vista preliminar"
+    edit_article_title: "Editar artículo"
 
-#  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
-#    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
-#    edit_article_title: "Edit Article"
+  general:
+    and: "y"
+    or: "o"
+    name: "Nombre"
+    body: "Cuerpo"
+    version: "Versión"
+    commit_msg: "Mensaje de Asignación o Commit"
+    version_history_for: "Historial de las versiones de: "
+    results: "Resultados"
+    description: "Descripción"
+    email: "Correo electrónico"
+    message: "Mensaje"
 
-#  general:
-#    and: "and"
+  about:
+    who_is_codecombat: "¿Qué es CodeCombat?"
+    why_codecombat: "¿Por qué CodeCombat?"
+    who_description_prefix: "juntos comenzamos CodeCombat en 2013. También creamos "
+    who_description_suffix: "en 2008, llegando a alcanzar el primer puesto en aplicaciones web, una app para iOS para el aprendizaje de la escritura de caracteres chinos y japoneses."
+    who_description_ending: "Es hora de empezar a enseñar a la gente a escribir código."
+    why_paragraph_1: "Mientras desarrollaba Skritter, George no sabía cómo programar y estaba constantemente frustrado por su incapacidad para implementar sus ideas. Posteriormente, intentó aprender, pero las lecciones eran demasiado lentas. Su compañero de piso, queriendo dejar de enseñar y reorientar su carrera, probó Codecademy, pero \"se aburrió. \" Cada semana otro amigo comenzaba en Codecademy, para terminar dejándolo posteriormente. Nos dimos cuenta de que era el mismo problema que habíamos resuelto con Skritter: gente aprendiendo una habilidad lentamente con lecciones intensivas cuando lo que necesitaban era una práctica rápida y extensa. Sabemos cómo solucionar eso."
+    why_paragraph_2: "¿Necesitas aprender a programar? No necesitas lecciones. Necesitas escribir muchísimo código y pasarlo bien haciéndolo."
+    why_paragraph_3_prefix: "De eso va la programación. Tiene que ser divertido. No divertido como:"
+    why_paragraph_3_italic: "¡bien una insignia!,"
+    why_paragraph_3_center: "sino más bien como:"
+    why_paragraph_3_italic_caps: "¡NO MAMA, TENGO QUE TERMINAR EL NIVEL!"
+    why_paragraph_3_suffix: "Por eso Codecombat es multijugador, no un curso con lecciones \"gamificadas\" . No pararemos hasta que tú no puedas parar... pero esta vez, eso será buena señal."
+    why_paragraph_4: "Si vas a engancharte a algún juego, engánchate a este y conviértete en uno de los magos de la era tecnológica."
+    why_ending: "Y, oye, es gratis. "
+    why_ending_url: "Comienza a hacer magia ¡ya!"
+    george_description: "CEO, el tipo de los negocios, diseñador web, diseñador de juegos y campeón de los programadores principiantes de todo el mundo."
+    scott_description: "Programador extraordinario, arquitecto de software, mago de la cocina y maestro de las finanzas. Scott es el razonable."
+    nick_description: "Mago de la programación, hechicero excéntrico de la motivación y experimentador del revés. Nick pudo haber hecho cualquier cosa y eligió desarrollar CodeCombat."
+    jeremy_description: "Mago de la atención al cliente, tester de usabilidad y organizador de la comunidad; es probable que ya hayas hablado con Jeremy."
+    michael_description: "Programador, administrador de sistemas y prodigio técnico, Michael es el encargado de mantener nuestros servidores en línea."
 
-#  about:
-#    who_is_codecombat: "Who is CodeCombat?"
-#    why_codecombat: "Why CodeCombat?"
-#    who_description_prefix: "together started CodeCombat in 2013. We also created "
-#    who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters."
-#    who_description_ending: "Now it's time to teach people to write code."
-#    why_paragraph_1: "When making Skritter, George didn't know how to program and was constantly frustrated by his inability to implement his ideas. Afterwards, he tried learning, but the lessons were too slow. His housemate, wanting to reskill and stop teaching, tried Codecademy, but \"got bored.\" Each week another friend started Codecademy, then dropped off. We realized it was the same problem we'd solved with Skritter: people learning a skill via slow, intensive lessons when what they need is fast, extensive practice. We know how to fix that."
-#    why_paragraph_2: "Need to learn to code? You don't need lessons. You need to write a lot of code and have a great time doing it."
-#    why_paragraph_3_prefix: "That's what programming is about. It's gotta be fun. Not fun like"
-#    why_paragraph_3_italic: "yay a badge"
-#    why_paragraph_3_center: "but fun like"
-#    why_paragraph_3_italic_caps: "NO MOM I HAVE TO FINISH THE LEVEL!"
-#    why_paragraph_3_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing."
-#    why_paragraph_4: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age."
-#    why_ending: "And hey, it's free. "
-#    why_ending_url: "Start wizarding now!"
-#    george_description: "CEO, business guy, web designer, game designer, and champion of beginning programmers everywhere."
-#    scott_description: "Programmer extraordinaire, software architect, kitchen wizard, and master of finances. Scott is the reasonable one."
-#    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
-#    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
-#    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+  legal:
+    page_title: "Legal"
+    opensource_intro: "CodeCombat es gratis y totalmente open source."
+    opensource_description_prefix: "Echa un vistazo a "
+    github_url: "nuestro GitHub"
+    opensource_description_center: "y ayúdanos si quieres. CodeCombat está desarrollado sobre docenas de proyectos open source, y nos encantana. Mira "
+    archmage_wiki_url: "nuestra wiki del Archimago"
+    opensource_description_suffix: "para encontrar una lista del software que hace este juego posible."
+    practices_title: "Prácticas respetuosas"
+    practices_description: "Esto es lo que te prometemos a ti, el jugador, sin usar mucha jerga legal."
+    privacy_title: "Privacidad"
+    privacy_description: "No venderemos tu información personal. Tenemos la intención de hacer dinero a través de la contratación con el tiempo, pero puedes estar seguro que no vamos a distribuir tu información personal a las empresas interesadas sin tu consentimiento expreso."
+    security_title: "Seguridad"
+    security_description: "Nos esforzamos por mantener segura tu información personal. Como proyecto de código abierto, nuestro sitio está abierto a cualquiera que quiera revisarlo y mejorar nuestros sistemas de seguridad."
+    email_title: "Correo electrónico"
+    email_description_prefix: "No te inundaremos con spam. Mediante"
+    email_settings_url: "tus ajustes de correo electrónico"
+    email_description_suffix: "o a través de los enlaces en los correos que te enviemos, puedes cambiar tus preferencias y darte de baja fácilmente en cualquier momento."
+    cost_title: "Precio"
+    cost_description: "Actualmente, ¡CodeCombat es 100% gratis! Uno de nuestros principales objetivos es mantenerlo así, de forma que el mayor número posible de gente pueda jugar, independientemente de sus posibilidades económicas. Si las cosas se tuercen, quizás tengamos que cobrar suscripciones o por algún contenido, pero preferimos no hacerlo. Con un poco de suerte, podremos mantener la empresa con: "
+    recruitment_title: "Contratación"
+    recruitment_description_prefix: "En CodeCombat, te vas a convertir en un poderoso mago no solo en el juego, también en el mundo real."
+    url_hire_programmers: "Nadie puede contratar programadores con la suficiente rapidez"
+    recruitment_description_suffix: "así que una vez que hayas afilado tus habilidades y si estás de acuerdo, mostraremos tus mejores logros en programación a los miles de empresas que están deseando tener la oportunidad de contratarte. Ellos nos pagan un poco y ellos te pagan a ti"
+    recruitment_description_italic: "un montón."
+    recruitment_description_ending: "La web permanece gratuita y todo el mundo es feliz. Ese es el plan."
+    copyrights_title: "Copyrights y Licencias"
+    contributor_title: "Acuerdo de Licencia del Colaborador"
+    contributor_description_prefix: "Todas las colaboraciones, tanto en la web como en nuestro repositorio de GitHub, están sujetas a nuestro"
+    cla_url: "CLA"
+    contributor_description_suffix: "con el que deberás estar de acuerdo antes de colaborar."
+    code_title: "Código - MIT"
+    code_description_prefix: "Todo el código propiedad de CodeCombat o alojado en codecombat.com, ambos en el repositorio GitHub repository o en la base de datos de codecombat.com, está licenciado bajo la "
+    mit_license_url: "Licencia MIT"
+    code_description_suffix: "Esto incluye todo el código en Sistemas y Componentes puesto a disposición por CodeCombat para la creación de niveles."
+    art_title: "Arte/Música - Creative Commons "
+    art_description_prefix: "Todo el contenido común está disponible bajo la"
+    cc_license_url: "Creative Commons Attribution 4.0 International License"
+    art_description_suffix: "Contenido común es cualquier cosa puesta a disposición por CodeCombat con el propósito de la creación de niveles. Esto incluye:"
+    art_music: "Música"
+    art_sound: "Sonido"
+    art_artwork: "Arte"
+    art_sprites: "Sprites"
+    art_other: "Otros trabajos creativos no relacionados con código puestos a disposición para la creación de Niveles."
+    art_access: "Actualmente no hay un sistema universal y fácil para ir en busca de esos recursos. En general, recógelos de las URLs como las usadas en el sitio, contáctanos para recibir asistencia, o ayúdanos a extender el sitio para hacer más facilmente accesibles estos recursos."
+    art_paragraph_1: "Para la atribución, por favor pon tu nombre y enlaza a codecombat.com cerca del lugar donde se utiliza la fuente o en su caso para el medio. Por ejemplo:"
+    use_list_1: "Si se usa en una película u otro juego, incluye codecombat.com en los créditos."
+    use_list_2: "Si se usa en una página web, incluye un enlace cerca de donde se use, por ejemplo bajo una imagen, o en una página general de atribuciones donde también menciones otros trabajos Creative Commons y software de código abierto que uses en tu web. Si ya se hace clara referencia a CodeCombat, como en el post de un blog mencionando a CodeCombat, no es necesaria una atribución del contenido por separado."
+    art_paragraph_2: "Si el contenido usado ha sido creado no por CodeCombat sino por un usuario de codecombat.com, deberá serle atribuido a dicho usuario y seguir las directrices de atribución proporcionadas en la descripción del recurso, si la hay."
+    rights_title: "Derechos Reservados"
+    rights_desc: "Todos los derechos reservados para los Niveles. Esto incluye"
+    rights_scripts: "Scripts"
+    rights_unit: "Configuración de la Unidad"
+    rights_description: "Descripción"
+    rights_writings: "Escritos"
+    rights_media: "Media (sonidos, música) y cualquier otro contenido creativo creado específicamente para ese Nivel y que no estuviera disponible para todos al crear el/los niveles."
+    rights_clarification: "Para aclarar, cualquier cosa que se pone a disposición en el editor de niveles con el fin de crear Niveles se encuentra bajo licencia CC, mientras que el contenido creado con el editor de niveles o subido en el curso de la creación de niveles no lo es."
+    nutshell_title: "En una palabra"
+    nutshell_description: "Todos los recursos que ofrecemos en el editor de niveles son libres de ser utilizados para crear niveles. Pero nos reservamos el derecho de restringir la distribución de los propios niveles (que se crean en codecombat.com) de modo que se pueda cobrar por ellos en el futuro, si eso es lo que termina sucediendo."
+    canonical: "La versión inglesa de este documento es la canónica, la definitiva. Si hay alguna diferencia con lo que pueda aparecer en las traducciones, la versión inglesa es la que prevalece sobre las demás."
 
-#  legal:
-#    page_title: "Legal"
-#    opensource_intro: "CodeCombat is free to play and completely open source."
-#    opensource_description_prefix: "Check out "
-#    github_url: "our GitHub"
-#    opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See "
-#    archmage_wiki_url: "our Archmage wiki"
-#    opensource_description_suffix: "for a list of the software that makes this game possible."
-#    practices_title: "Respectful Best Practices"
-#    practices_description: "These are our promises to you, the player, in slightly less legalese."
-#    privacy_title: "Privacy"
-#    privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent."
-#    security_title: "Security"
-#    security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems."
-#    email_title: "Email"
-#    email_description_prefix: "We will not inundate you with spam. Through"
-#    email_settings_url: "your email settings"
-#    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
-#    cost_title: "Cost"
-#    cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:"
-#    recruitment_title: "Recruitment"
-#    recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life."
-#    url_hire_programmers: "No one can hire programmers fast enough"
-#    recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you"
-#    recruitment_description_italic: "a lot"
-#    recruitment_description_ending: "the site remains free and everybody's happy. That's the plan."
-#    copyrights_title: "Copyrights and Licenses"
-#    contributor_title: "Contributor License Agreement"
-#    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
-#    cla_url: "CLA"
-#    contributor_description_suffix: "to which you should agree before contributing."
-#    code_title: "Code - MIT"
-#    code_description_prefix: "All code owned by CodeCombat or hosted on codecombat.com, both in the GitHub repository or in the codecombat.com database, is licensed under the"
-#    mit_license_url: "MIT license"
-#    code_description_suffix: "This includes all code in Systems and Components that are made available by CodeCombat for the purpose of creating levels."
-#    art_title: "Art/Music - Creative Commons "
-#    art_description_prefix: "All common content is available under the"
-#    cc_license_url: "Creative Commons Attribution 4.0 International License"
-#    art_description_suffix: "Common content is anything made generally available by CodeCombat for the purpose of creating Levels. This includes:"
-#    art_music: "Music"
-#    art_sound: "Sound"
-#    art_artwork: "Artwork"
-#    art_sprites: "Sprites"
-#    art_other: "Any and all other non-code creative works that are made available when creating Levels."
-#    art_access: "Currently there is no universal, easy system for fetching these assets. In general, fetch them from the URLs as used by the site, contact us for assistance, or help us in extending the site to make these assets more easily accessible."
-#    art_paragraph_1: "For attribution, please name and link to codecombat.com near where the source is used or where appropriate for the medium. For example:"
-#    use_list_1: "If used in a movie or another game, include codecombat.com in the credits."
-#    use_list_2: "If used on a website, include a link near the usage, for example underneath an image, or in a general attributions page where you might also mention other Creative Commons works and open source software being used on the site. Something that's already clearly referencing CodeCombat, such as a blog post mentioning CodeCombat, does not need some separate attribution."
-#    art_paragraph_2: "If the content being used is created not by CodeCombat but instead by a user of codecombat.com, attribute them instead, and follow attribution directions provided in that resource's description if there are any."
-#    rights_title: "Rights Reserved"
-#    rights_desc: "All rights are reserved for Levels themselves. This includes"
-#    rights_scripts: "Scripts"
-#    rights_unit: "Unit configuration"
-#    rights_description: "Description"
-#    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_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
-#    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
+  contribute:
+    page_title: "Colaborar"
+    character_classes_title: "Clases de Personajes"
+    introduction_desc_intro: "Tenemos muchas esperanzas en CodeCombat."
+    introduction_desc_pref: "Queremos estar donde programadores de todo tipo vengan a aprender y jugar juntos, introducir a otros en el maravilloso mundo de la programación y reflejar la mejor parte de la comunidad. No podemos, ni queremos, hacerlo solos; lo que hace grandes a proyectos como GitHub, Stack Overflow y Linux es la gente que los usa y crea con ellos. A tal fin, "
+    introduction_desc_github_url: "CodeCombat es totalmente de código abierto"
+    introduction_desc_suf: ", y nuestro objetivo es ofrecer tantas maneras como sea posible para que tomes parte y hagas de este proyecto algo tan tuyo como nuestro."
+    introduction_desc_ending: "¡Esperamos que te unas a nuestro equipo!"
+    introduction_desc_signature: "- Nick, George, Scott, Michael y Jeremy"
+    alert_account_message_intro: "¡Hola!"
+    alert_account_message_pref: "Para suscribirte a los correos electrónicos de las distintas Clases, necesitarás "
+    alert_account_message_suf: "primero."
+    alert_account_message_create_url: "crear una cuenta"
+    archmage_introduction: "Una de las mejores partes de desarrollar juegos es que combinan cosas muy diferentes. Gráficos, sonido, uso de redes en tiempo real, redes sociales y por supuesto mucho de los aspectos comunes de la programación, desde gestión de bases de datos a bajo nivel y administración de servidores hasta diseño de experiencia del usuario y creación de interfaces. Hay un montón de cosas por hacer y si eres un programador experimentado con interés en conocer lo que se cuece en la trastienda de CodeCombat, esta Clase puede ser la ideal para ti. Nos encantaría recibir tu ayuda para crear el mejor juego de programación de la historia."
+    class_attributes: "Atributos de las Clases"
+    archmage_attribute_1_pref: "Conocimiento en "
+    archmage_attribute_1_suf: ", o deseo por aprender. La mayor parte de nuestro código está escrito en este lenguaje. Si eres un fan de Ruby o Python te sentirás como en casa. Es JavaScript pero con una sintaxis más agradable."
+    archmage_attribute_2: "Alguna experiencia en programación e iniciativa personal. Te orientaremos, pero no podemos pasar mucho tiempo enseñándote."
+    how_to_join: "Cómo unirse"
+    join_desc_1: "¡Cualquiera puede ayudar! Solo echa un vistazo a nuestro "
+    join_desc_2: "para comenzar y marca la casilla de abajo para etiquetarte como un bravo Archimago y obtener las últimas noticias por correo electrónico. ¿Quieres charlar sobre qué hacer o como involucrarte más? "
+    join_desc_3: ", o encuéntranos en nuestro "
+    join_desc_4: "¡y partiremos desde ese punto!"
+    join_url_email: "Escríbenos un correo electrónico"
+    join_url_hipchat: "sala pública en HipChat"
+    more_about_archmage: "Aprende más sobre convertirte en un poderoso Archimago"
+    archmage_subscribe_desc: "Recibe correos sobre nuevos anuncios y oportunidades de codificar."
+    artisan_introduction_pref: "¡Debemos construir niveles adicionales! La gente clama por más contenido y solo podemos crear unos cuantos. Ahora mismo tu estación de trabajo es el nivel uno; nuestro editor de niveles es apenas usable por sus creadores, así que ten cuidado. Si tienes visiones de campañas que alcanzan el infinito"
+    artisan_introduction_suf: "entonces esta Clase es ideal para ti."
+    artisan_attribute_1: "Cualquier experiencia creando contenido similar estaría bien, como por ejemplo el editor de niveles de Blizzard. ¡Aunque no es necesaria!"
+    artisan_attribute_2: "Un anhelo de hacer un montón de testeo e iteraciones. Para hacer buenos niveles necesitas mostrárselos a otros y mirar como juegan, además de estar preparado para encontrar los fallos a reparar."
+    artisan_attribute_3: "Por el momento, la resistencia va a la par con el Aventurero. Nuestro editor de niveles está a un nivel de desarrollo temprano y puede ser muy frustrante usarlo. ¡Estás advertido!"
+    artisan_join_desc: "Sigue las siguientes indicaciones para usar el editor de niveles. Tómalo o déjalo:"
+    artisan_join_step1: "Lee la documentación."
+    artisan_join_step2: "Crea un nuevo nivel y explora los niveles existentes."
+    artisan_join_step3: "Busca nuestra sala pública de HipChat en busca de ayuda."
+    artisan_join_step4: "Publica tus niveles en el foro para recibir comentarios críticos."
+    more_about_artisan: "Aprende más sobre convertirte en un Artesano creativo"
+    artisan_subscribe_desc: "Recibe correos sobre actualizaciones del editor de niveles y anuncios."
+    adventurer_introduction: "Hablemos claro sobre tu papel: eres el tanque. Vas a recibir fuertes daños. Necesitamos gente para probar nuestros flamantes niveles y ayudar a mejorarlos. El dolor será enorme; hacer buenos juegos es un proceso largo y nadie lo consigue a la primera. Si puedes resistir y tener una puntuación alta en Resistencia, entonces esta Clase es para ti."
+    adventurer_attribute_1: "Estar sediento de conocimientos. Quieres aprender a programar y nosotros queremos enseñarte cómo hacerlo. Aunque en este caso es más probable que seas tú el que esté haciendo la mayor parte de la enseñanza."
+    adventurer_attribute_2: "Carismático. Se amable pero claro a la hora de desglosar qué necesita ser mejorado y sugiere de qué formas podría hacerse."
+    adventurer_join_pref: "Reúnete con (¡o recluta!) un Artesano y trabaja con ellos, o marca la casilla de abajo para recibir un correo cuando haya nuevos niveles para testar. También publicaremos en nuestras redes nuevos niveles para revisar"
+    adventurer_forum_url: "nuestro foro"
+    adventurer_join_suf: "así que si prefieres estar informado en esa forma, ¡crea una cuenta allí!"
+    more_about_adventurer: "Aprende más sobre cómo convertirte en un bravo Aventurero"
+    adventurer_subscribe_desc: "Recibe correos cuando haya nuevos niveles para testar."
+    scribe_introduction_pref: "CodeCombat no será solo un montón de niveles. También será una fuente de conocimientos, una wiki de conceptos de programación a la que los niveles se engancharan. De esa forma, en lugar de que cada Artesano tenga que describir en detalle qué es un operador de comparación, podrá simplemente enlazar el nivel al Artículo que los describe y que ya ha sido escrito para edificación del jugador. Algo en la línea de lo que la "
+    scribe_introduction_url_mozilla: "Mozilla Developer Network"
+    scribe_introduction_suf: " ha construido. Si tu idea de diversión es articular los conceptos de la programación de una forma sencilla, entonces esta clase es para ti."
+    scribe_attribute_1: "Habilidad a la hora de escribir es casi todo lo que necesitas. No solo dominar la gramática y la ortografía sino también expresar ideas complicadas a los demás de forma sencilla."
+    contact_us_url: "Escribenos un correo electrónico"
+    scribe_join_description: "cuéntanos más sobre ti, tu experiencia en el mundo de la programación y sobre qué cosas te gustaría escribir. ¡Y continuaremos a partir de ahí!"
+    more_about_scribe: "Aprende más sobre convertirte en un Escriba diligente"
+    scribe_subscribe_desc: "Recibe correos sobre anuncios de redacción de Artículos."
+    diplomat_introduction_pref: "Así, si hemos aprendido algo desde el "
+    diplomat_launch_url: "lanzamiento en octubre"
+    diplomat_introduction_suf: "hay un interés considerable en CodeCombat en otros paises, ¡especialmente Brasil! Estamos formando un cuerpo de traductores con ganas de traducir un grupo de palabras tras otro para hacer CodeCombat tan accesible para todo el mundo como sea posible. Si quieres recibir avances de próximos contenidos y quieres poner esos niveles a disposición de los que comparten tu idioma tan pronto como sea posible, entonces esta Clase es para ti."
+    diplomat_attribute_1: "Fluidez con el ingles y el lenguaje al que quieras traducir. Cuando de transmitir ideas complejas se trata, ¡es importante tener grandes conocimientos de ambas!"
+    diplomat_join_pref: "Hemos comenzado un montón de traducciones en "
+    diplomat_doc_url: "este post del foro"
+    diplomat_join_suf: "así que échale un vistazo y añade cosas para tu idioma. También, marca la casilla de abajo para mantenerte al día en nuevos desarrollos de internacionalización!"
+    more_about_diplomat: "Aprende más sobre cómo convertirte en un gran Diplomático"
+    diplomat_subscribe_desc: "Recibe correos sobre nuevos niveles y desarrollos para traducir."
+    ambassador_introduction: "Esta es una comunidad en construcción y tú eres parte de las conexiones. Tenemos chat Olark, correos electrónicos y las redes sociales con una gran cantidad de personas con quienes hablar, ayudar a familiarizarse con el juego y aprender. Si quieres ayudar a la gente a que se involucre, se divierta, y tenga buenas sensaciones sobre CodeCombat y hacia dónde vamos, entonces esta clase es para ti."
+    ambassador_attribute_1: "Habilidades de comunicación. Ser capaz de identificar los problemas que los jugadores están teniendo y ayudarles a resolverlos. Además, mantener al resto de nosotros informados sobre lo que los jugadores están diciendo, lo que les gusta, lo que no ¡y de lo que quieren más!"
+    ambassador_join_desc: "cuéntanos más sobre ti, que has hecho y qué estarías interesado en hacer. ¡Y continuaremos a partir de ahí!"
+    ambassador_join_note_strong: "Nota"
+    ambassador_join_note_desc: "Una de nuestras principales prioridades es construir un modo multijugador donde los jugadores con mayores dificultades a la hora de resolver un nivel, puedan invocar a los magos más avanzados para que les ayuden. Será una buena manera de que los Embajadores puedan hacer su trabajo. ¡Te mantendremos informado!"
+    more_about_ambassador: "Aprende más sobre cómo convertirte en un amable Embajador"
+    ambassador_subscribe_desc: "Recibe correos sobre actualizaciones de soporte y desarrollo del multijugador."
+    counselor_introduction_1: "¿Tienes mucha experiencia vital? ¿Una perspectiva diferente de las cosas que nos puede ayudar a decidir cómo moldear CodeCombat? De todos estos papeles, este es el que te llevará menos tiempo pero en el que marcarás más la diferencia. Estamos buscando eruditos particularmente en áreas como: enseñanza, desarrollo de juegos, gestión de proyectos de código abierto, contratación de técnicos, iniciativa empresarial o diseño."
+    counselor_introduction_2: "O realmente cualquier cosa que sea relevante para el desarrollo de CodeCombat. Si tienes el conocimiento y quieres compartirlo para ayudar a que este proyecto crezca, entonces esta Clase es ideal para ti."
+    counselor_attribute_1: "Experiencia en cualquiera de las áreas mencionadas, o en lo que creas que puede ser de utilidad."
+    counselor_attribute_2: "¡Un poco de tiempo libre!"
+    counselor_join_desc: "cuéntanos un poco sobre ti, qué has hecho y qué estarías interesado en hacer. Te pondremos en nuestra lista de contactos y te daremos un toque cuando necesitemos consejo (no muy a menudo)."
+    more_about_counselor: "Aprende más sobre cómo convertirte en un valioso Consejero"
+    changes_auto_save: "Los cambios son guardados automáticamente cuando marcas las casillas de verificación."
+    diligent_scribes: "Nuestros diligentes Escribas:"
+    powerful_archmages: "Nuestros poderosos Archimagos:"
+    creative_artisans: "Nuestros creativos Artesanos:"
+    brave_adventurers: "Nuestros bravos Aventureros:"
+    translating_diplomats: "Nuestros políglotas Diplomáticos:"
+    helpful_ambassadors: "Nuestros amables Embajadores:"
 
-#  contribute:
-#    page_title: "Contributing"
-#    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"
-#    introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours."
-#    introduction_desc_ending: "We hope you'll join our party!"
-#    introduction_desc_signature: "- Nick, George, Scott, Michael, and Jeremy"
-#    alert_account_message_intro: "Hey there!"
-#    alert_account_message_pref: "To subscribe for class emails, you'll need to "
-#    alert_account_message_suf: "first."
-#    alert_account_message_create_url: "create an account"
-#    archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever."
-#    class_attributes: "Class Attributes"
-#    archmage_attribute_1_pref: "Knowledge in "
-#    archmage_attribute_1_suf: ", or a desire to learn. Most of our code is in this language. If you're a fan of Ruby or Python, you'll feel right at home. It's JavaScript, but with a nicer syntax."
-#    archmage_attribute_2: "Some experience in programming and personal initiative. We'll help you get oriented, but we can't spend much time training you."
-#    how_to_join: "How To Join"
-#    join_desc_1: "Anyone can help out! Just check out our "
-#    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_hipchat: "public HipChat room"
-#    more_about_archmage: "Learn More About Becoming A Powerful Archmage"
-#    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
-#    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "to then this class might be for you."
-#    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
-#    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
-#    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
-#    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
-#    artisan_join_step1: "Read the documentation."
-#    artisan_join_step2: "Create a new level and explore existing levels."
-#    artisan_join_step3: "Find us in our public HipChat room for help."
-#    artisan_join_step4: "Post your levels on the forum for feedback."
-#    more_about_artisan: "Learn More About Becoming A Creative Artisan"
-#    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
-#    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
-#    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
-#    adventurer_attribute_2: "Charismatic. Be gentle but articulate about what needs improving, and offer suggestions on how to improve."
-#    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
-#    adventurer_forum_url: "our forum"
-#    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    more_about_adventurer: "Learn More About Becoming A Brave Adventurer"
-#    adventurer_subscribe_desc: "Get emails when there are new levels to test."
-#    scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
-#    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"
-#    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 Diligent Scribe"
-#    scribe_subscribe_desc: "Get emails about article writing announcements."
-#    diplomat_introduction_pref: "So, if there's one thing we learned from the "
-#    diplomat_launch_url: "launch in October"
-#    diplomat_introduction_suf: "it's that there is sizeable interest in CodeCombat in other countries, particularly Brazil! We're building a corps of translators eager to turn one set of words into another set of words to get CodeCombat as accessible across the world as possible. If you like getting sneak peeks at upcoming content and getting these levels to your fellow nationals ASAP, then this class might be for you."
-#    diplomat_attribute_1: "Fluency in English and the language you would like to translate to. When conveying complicated ideas, it's important to have a strong grasp in both!"
-#    diplomat_join_pref: "We've started a lot of initial translations at "
-#    diplomat_doc_url: "this forum post"
-#    diplomat_join_suf: "so check it out and add things for your language. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    more_about_diplomat: "Learn More About Becoming A Great Diplomat"
-#    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
-#    ambassador_introduction: "This is a community we're building, and you are the connections. We've got Olark chats, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
-#    ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
-#    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
-#    ambassador_join_note_strong: "Note"
-#    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-#    more_about_ambassador: "Learn More About Becoming A Helpful Ambassador"
-#    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
-#    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
-#    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
-#    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming A Valuable 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:"
-
-#  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: "Archimago"
+    archmage_title_description: "(Programador)"
+    artisan_title: "Artesano"
+    artisan_title_description: "(Diseñador de Niveles)"
+    adventurer_title: "Aventurero"
+    adventurer_title_description: "(Tester de Niveles)"
+    scribe_title: "Escriba"
+    scribe_title_description: "(Editor de Artículos)"
+    diplomat_title: "Diplomático"
+    diplomat_title_description: "(Traductor)"
+    ambassador_title: "Embajador"
+    ambassador_title_description: "(Soporte)"
+    counselor_title: "Consejero"
+    counselor_title_description: "(Experto/Profesor)"

app/locale/es.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "español", englishDescription: "Spanish", translation:
   common:
     loading: "Cargando..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Guardando..."
+    sending: "Enviando..."
+    cancel: "Cancelar"
+#    save: "Save"
+    delay_1_sec: "1 segundo"
+    delay_3_sec: "3 segundos"
+    delay_5_sec: "5 segundos"
+    manual: "Manual"
+#    fork: "Fork"
+    play: "Jugar"
 
   modal:
     close: "Cerrar"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     page_not_found: "Pagina no encontrada"
 
   nav:
-    sign_up: "Crear Cuenta"
-    log_in: "Iniciar Sesión"
-    log_out: "Cerrar Sesión"
     play: "Jugar"
     editor: "Editor"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     twitter_follow: "Seguir"
 #    employers: "Employers"
 
-  forms:
-    name: "Nombre"
-    email: "Email"
-    message: "Mensaje"
-    cancel: "Cancelar"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "Iniciar sesión"
-    sign_up: "crear nueva cuenta"
-    or: ", o "
+    sign_up: "Crear Cuenta"
+    log_in: "Iniciar Sesión"
+    log_out: "Cerrar Sesión"
     recover: "recuperar cuenta"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     coppa_why: "¿Por qué?"
     creating: "Creando Cuenta..."
     sign_up: "Registrarse"
-    or: "o "
     log_in: "Inicia sesión con tu contraseña"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     forum_prefix: "Para cualquier cosa pública, por favor prueba "
     forum_page: "nuestro foro"
     forum_suffix: " en su lugar."
-    sending: "Enviando..."
     send: "Enviar Comentario"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     new_password_verify: "Verificar"
     email_subscriptions: "Suscripciones de Email"
     email_announcements: "Noticias"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Recibe correos electrónicos con las últimas noticias y desarrollos de CodeCombat."
     contributor_emails: "Correos Para Colaboradores"
     contribute_prefix: "¡Buscamos gente que se una a nuestro comunidad! Comprueba la "
     contribute_page: "página de colaboraciones"
     contribute_suffix: " para saber más."
     email_toggle: "Activar todo"
-    saving: "Guardando..."
     error_saving: "Error al guardar"
     saved: "Cambios guardados"
     password_mismatch: "El password no coincide"
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     tome_cast_button_casting: "Invocando"
     tome_cast_button_cast: "Invocar"
     tome_autocast_delay: "Demora de Autolanzamiento"
-    tome_autocast_1: "1 segundo"
-    tome_autocast_3: "3 segundos"
-    tome_autocast_5: "5 segundos"
-    tome_autocast_manual: "Manual"
     tome_select_spell: "Selecciona un Hechizo"
     tome_select_a_thang: "Selecciona Alguien para "
     tome_available_spells: "Hechizos Disponibles"
     hud_continue: "Continuar (presionar shift+space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "o"
+    name: "Nombre"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Email"
+    message: "Mensaje"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/fa.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     loading: "...در حال بارگذاری"
     saving: "...در حال ذخیره سازی"
     sending: "...در حال ارسال"
+    cancel: "لغو"
+    save: "ذخیره "
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+    play: "سطوح"
 
   modal:
     close: "بستن"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     page_not_found: "صفحه پیدا نشد"
 
   nav:
-    sign_up: "ایجاد حساب کاربری"
-    log_in: "ورود"
-    log_out: "خروج"
     play: "سطوح"
     editor: "ویرایشگر"
     blog: "بلاگ"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     twitter_follow: "دنبال کردن"
     employers: "Employers"
 
-  forms:
-    name: "نام"
-    email: "ایمیل"
-    message: "پیام"
-    cancel: "لغو"
-    save: "ذخیره "
-
   versions:
     save_version_title: "ذخیره کردن نسخه جدید"
-    commit_message: "Commit Message"
     new_major_version: "New Major Version"
     cla_prefix: "To save changes, first you must agree to our"
     cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     cla_agree: "موافقم"
 
   login:
-    login_modal_title: "ورود"
-    log_in: "ورود"
     sign_up: "ایجاد حساب کاربری"
-    or: ", یا "
+    log_in: "ورود"
+    log_out: "خروج"
     recover: "بازیابی حساب کاربری"
 
   recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     coppa_why: "(چرا؟)"
     creating: "...در حال ایجاد حساب کاربری"
     sign_up: "ثبت نام"
-    or: " یا"
     log_in: "ورود به وسیله رمز عبور"
 
   home:
@@ -72,31 +67,30 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     no_mobile: "این بازی برای دستگاه های موبایل طراحی نشده است و بر روی آن ها اجرا نمی شود"
     play: "شروع بازی"
 
-#  play:
-#    choose_your_level: "Choose Your Level"
-#    adventurer_prefix: "You can jump to any level below, or discuss the levels on "
-#    adventurer_forum: "the Adventurer forum"
-#    adventurer_suffix: "."
-#    campaign_beginner: "Beginner Campaign"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
+  play:
+    choose_your_level: "مرحله خود را انتخاب کنید"
+    adventurer_prefix: "شما می توانید به هرکدام از مراحل زیر پرش کنید یا ,در مورد آن مرحله بحث کنید"
+    adventurer_forum: "انجمن ماجراجو ها"
+    adventurer_suffix: "."
+    campaign_beginner: "کمپین تازه کارها"
+    campaign_beginner_description: ".که شما در آن می توانید جادوگری به وسیله برنامه نویسی را یادبگیرید..."
+    campaign_dev: "مراحل سخت تصادفی"
 #    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
+    campaign_multiplayer: "مسابقات چند نفره"
 #    campaign_multiplayer_description: "... in which you code head-to-head against other players."
-#    campaign_player_created: "Player-Created"
+    campaign_player_created: "ایجاد بازیکن"
 #    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
 #    level_difficulty: "Difficulty: "
 
-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
+  contact:
+    contact_us: "CodeCombatتماس با "
+    welcome: "خوب است از شما بشنویم, از طریق این فرم برای ما ایمیل ارسال کنید"
 #    contribute_prefix: "If you're interested in contributing, check out our "
 #    contribute_page: "contribute page"
 #    contribute_suffix: "!"
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "یا"
+    name: "نام"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "ایمیل"
+    message: "پیام"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/fi.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/fr.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     loading: "Chargement..."
     saving: "Sauvegarde..."
     sending: "Envoi..."
+    cancel: "Annuler"
+    save: "Sauvegarder"
+    delay_1_sec: "1 seconde"
+    delay_3_sec: "3 secondes"
+    delay_5_sec: "5 secondes"
+    manual: "Manuel"
+    fork: "Fork"
+    play: "Jouer"
 
   modal:
     close: "Fermer"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     page_not_found: "Page non trouvée"
 
   nav:
-    sign_up: "Créer un compte"
-    log_in: "Connexion"
-    log_out: "Déconnexion"
     play: "Jouer"
     editor: "Éditeur"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     twitter_follow: "Suivre"
     employers: "Employeurs"
 
-  forms:
-    name: "Nom"
-    email: "Courriel"
-    message: "Message"
-    cancel: "Annuler"
-    save: "Sauvegarder"
-
   versions:
     save_version_title: "Enregistrer une nouvelle version"
-    commit_message: "Message de mise à jour"
     new_major_version: "Nouvelle version majeure"
     cla_prefix: "Pour enregistrer vos modifications vous devez d'abord accepter notre"
     cla_url: "Licence de Copyright"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     cla_agree: "J'accepte"
 
   login:
-    login_modal_title: "Connexion"
+    sign_up: "Créer un compte"
     log_in: "Connexion"
-    sign_up: "Créer un nouveau compte"
-    or: ", ou "
+    log_out: "Déconnexion"
     recover: "récupérer son compte"
 
   recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     coppa_why: "(Pourquoi?)"
     creating: "Création du compte en cours..."
     sign_up: "S'abonner"
-    or: "ou "
     log_in: "se connecter avec votre mot de passe"
 
   home:
@@ -83,7 +78,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     campaign_dev_description: "... dans lesquels vous apprendrez à utiliser l'interface en faisant quelque chose d'un petit peu plus dur."
     campaign_multiplayer: "Campagne multi-joueurs"
     campaign_multiplayer_description: "... dans laquelle vous codez en face à face contre d'autre joueurs."
-    campaign_player_created: "Joueur créé"
+    campaign_player_created: "Niveaux créés par les joueurs"
     campaign_player_created_description: "... Dans laquelle vous serz confrontés à la créativité des votres.<a href=\"/contribute#artisan\">Artisan Wizards</a>."
     level_difficulty: "Difficulté: "
 
@@ -96,14 +91,13 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     forum_prefix: "Pour tout sujet d'ordre publique, merci d'utiliser "
     forum_page: "notre forum"
     forum_suffix: " à la place."
-    sending: "Envoi..."
     send: "Envoyer un commentaire"
 
   diplomat_suggestion:
     title: "Aidez à traduire CodeCombat!"
     sub_heading: "Nous avons besoin de vos compétences en langues."
     pitch_body: "Nous développons CodeCombat en Anglais, mais nous avons déjà des joueurs de partout dans le monde. Beaucoup d'entre eux veulent jouer en Français mais ne parlent pas l'anglais, donc si vous parlez aussi bien l'anglais que le français, aidez-nous en devenant traducteur et aidez à traduire aussi bien le site que tous les niveaux en français."
-    missing_translations: "Jusqu'a ce que nous ayons tout traduit en français, vous verrez de l'anglais quand le français ne sera pas disponible."
+    missing_translations: "Jusqu'à ce que nous ayons tout traduit en français, vous verrez de l'anglais quand le français ne sera pas disponible."
     learn_more: "Apprenez en plus sur les Traducteurs"
     subscribe_as_diplomat: "Souscrire en tant que traducteur"
 
@@ -128,19 +122,19 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     new_password_verify: "Vérifier"
     email_subscriptions: "Abonnements"
     email_announcements: "Annonces"
+    email_notifications_description: "Recevoir des notifications périodiques sur votre compte."
     email_announcements_description: "Recevoir des mails sur les dernières actualités et sur le développement de CodeCombat."
     contributor_emails: "Emails des contributeurs"
     contribute_prefix: "Nous recherchons des personnes pour se joindre à notre groupe! Consultez la "
     contribute_page: "page de contribution"
     contribute_suffix: " pour en savoir plus."
     email_toggle: "Tout basculer"
-    saving: "Enregistrement..."
     error_saving: "Probleme d'enregistrement"
     saved: "Changements sauvegardés"
     password_mismatch: "Le mot de passe ne correspond pas."
 
   account_profile:
-    edit_settings: "Editer les préférences"
+    edit_settings: "Éditer les préférences"
     profile_for_prefix: "Profil pour "
     profile_for_suffix: ""
     profile: "Profil"
@@ -148,7 +142,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     gravatar_not_found_mine: "Nous n'avons pas pu trouver votre profil associé à: "
     gravatar_not_found_email_suffix: "."
     gravatar_signup_prefix: "S'incrire à "
-    gravatar_signup_suffix: "pour commencer !"
+    gravatar_signup_suffix: " pour commencer !"
     gravatar_not_found_other: "Hélas, il n'y a pas de profil associé à l'adresse électronique de cette personne."
     gravatar_contact: "Contact"
     gravatar_websites: "Sites"
@@ -176,7 +170,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     victory_sign_up_poke: "Vous voulez recevoir les dernières actualités par mail? Créez un compte gratuitement et nous vous tiendrons informés!"
     victory_rate_the_level: "Notez ce niveau: "
     victory_play_next_level: "Jouer au prochain niveau"
-    victory_go_home: "Retourner à l'&ccueil"
+    victory_go_home: "Retourner à l'accueil"
     victory_review: "Dites-nous en plus!"
     victory_hour_of_code_done: "Déjà fini ?"
     victory_hour_of_code_done_yes: "Oui, j'ai fini mon heure de code!"
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tome_cast_button_casting: "Sort en court"
     tome_cast_button_cast: "Sort jeté"
     tome_autocast_delay: "Temps de recharge"
-    tome_autocast_1: "1 seconde"
-    tome_autocast_3: "3 secondes"
-    tome_autocast_5: "5 secondes"
-    tome_autocast_manual: "Manuel"
     tome_select_spell: "Choisissez un sort"
     tome_select_a_thang: "Sélectionnez une unité pour"
     tome_available_spells: "Sorts diponibles"
     hud_continue: "Continuer (appuie sur shift-espace)"
+#    spell_saved: "Spell Saved"
 
   admin:
     av_title: "Vues d'administrateurs"
@@ -213,74 +204,57 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     lg_title: "Dernières parties"
 
   editor:
-    main_title: "Editeurs CodeCombat"
-    main_description: "Créé tes propres niveaux, campagnes, unités et contenu éducatif. Nous vous fournissons tous les outils dont vous avez besoin!"
-    article_title: "Editeur d'article"
-    article_description: "Ecris des articles qui donnent aux joueurs un aperçu des concepts de programmation qui peuvent être utilisés dans différents niveaux et campagnes."
-    thang_title: "Editeur Thang"
-    thang_description: "Créé des unités, definis leur comportement de base, graphisme et son. Pour l'instant ne supporte que l'importation d'images vectorielles exportées de Flash."
-    level_title: "Editeur de niveau"
-    level_description: "Inclus les outils de script, le téléversement de vidéos, et l'élaboration de logiques personnalisées pour créer toutes sortes de niveaux. Tout ce que nous utilisons nous-mêmes!"
+    main_title: "Éditeurs CodeCombat"
+    main_description: "Crée tes propres niveaux, campagnes, unités et contenu éducatif. Nous vous fournissons tous les outils dont vous avez besoin!"
+    article_title: "Éditeur d'article"
+    article_description: "Écris des articles qui donnent aux joueurs un aperçu des concepts de programmation qui peuvent être utilisés dans différents niveaux et campagnes."
+    thang_title: "Éditeur Thang"
+    thang_description: "Crée des unités, définis leur comportement de base, graphisme et son. Pour l'instant ne supporte que l'importation d'images vectorielles exportées de Flash."
+    level_title: "Éditeur de niveau"
+    level_description: "Inclut les outils de script, le téléversement de vidéos, et l'élaboration de logiques personnalisées pour créer toutes sortes de niveaux. Tout ce que nous utilisons nous-mêmes!"
     security_notice: "Plusieurs caractéristiques majeures de cet éditeur ne sont pas encore activées par défaut. Quand nous aurons amélioré la sécurité de ces éléments, ils seront rendus disponibles. Si vous voulez les utiliser plus rapidement, "
     contact_us: "contactez nous!"
     hipchat_prefix: "Vous pouvez aussi nous trouver dans notre "
     hipchat_url: "conversation HipChat."
-    level_btn_save: "Sauver"
-    level_btn_fork: "Fork"
-    level_btn_play: "Jouer"
     level_some_options: "Quelques options?"
-
-    level_options_1_second: "1 seconde"
-    level_options_3_seconds: "3 secondes"
-    level_options_5_seconds: "5 secondes"
-    level_options_manual: "Manuel"
     level_tab_thangs: "Thangs"
     level_tab_scripts: "Scripts"
     level_tab_settings: "Paramètres"
     level_tab_components: "Composants"
-    level_tab_systems: "Systemes"
+    level_tab_systems: "Systèmes"
     level_tab_thangs_title: "Thangs actuels"
     level_tab_thangs_conditions: "Conditions de départ"
     level_tab_thangs_add: "ajouter des Thangs"
     level_settings_title: "Paramètres"
     level_component_tab_title: "Composants actuels"
     level_component_btn_new: "Créer un nouveau composant"
-    level_systems_tab_title: "Systemes actuels"
+    level_systems_tab_title: "Systèmes actuels"
     level_systems_btn_new: "Créer un nouveau système"
     level_systems_btn_add: "Ajouter un système"
     level_components_title: "Retourner à tous les Thangs"
     level_components_type: "Type"
-    level_component_edit_title: "Editer le composant"
-    level_system_edit_title: "Editer le systeme"
-
+    level_component_edit_title: "Éditer le composant"
+    level_system_edit_title: "Éditer le système"
     create_system_title: "Créer un nouveau système"
-    create_system_field_name: "Nom"
-    create_system_btn_cancel: "Annuler"
-    create_system_btn_create: "Créer"
     new_component_title: "Créer un nouveau composant"
     new_component_field_system: "Système"
-    new_component_field_name: "Nom"
-    new_component_btn_cancel: "Annuler"
-    new_component_btn_create: "Créer"
-
-  level:
-    index_table_results: "Résultats"
-    index_table_name: "Nom"
-    index_table_description: "Description"
-    index_table_version: "Version"
 
   article:
-    index_table_results: "Résultats"
-    index_table_name: "Nom"
-    index_table_body: "Corps"
-    index_table_version: "Version"
-    edit_btn_save: "Sauvegarder"
     edit_btn_preview: "Prévisualiser"
-    edit_article_title: "Editer l'article"
-
+    edit_article_title: "Éditer l'article"
 
   general:
     and: "et"
+    or: "ou"
+    name: "Nom"
+    body: "Corps"
+    version: "Version"
+    commit_msg: "Message de mise à jour"
+#    version_history_for: "Version History for: "
+    results: "Résultats"
+    description: "Description"
+    email: "Courriel"
+    message: "Message"
 
   about:
     who_is_codecombat: "Qui est CodeCombat?"
@@ -288,7 +262,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     who_description_prefix: "ont lancé CodeCombat ensemble en 2013. Nous avons aussi créé "
     who_description_suffix: "en 2008, l'améliorant jusqu'au rang de première application web et iOS pour apprendre à écrire les caractères chinois et japonais."
     who_description_ending: "Maintenant nous apprenons aux gens à coder."
-    why_paragraph_1: "En développant Skritter, George ne savait pas programmer et été frustré de ne pas pouvoir implémenter ses idées. Ensuite, il essaya d'apprendre, mais les cours n'étaient pas assez rapides. Son colocataire, voulant se requalifier et arrêter d'apprendre, essaya Codecademy, mais \"s'ennuya.\" Chaque semaine un nouvel ami commença Codecademy, puis abandonna. Nous nous sommes rendus compte que nous avions résolu le même problème avec Skritter: les gens apprennant grâce à des cours lents et intensifs quand nous avons besoin d'expérience rapide et intensive. Nous savons comment remédier à ça."
+    why_paragraph_1: "En développant Skritter, George ne savait pas programmer et était frustré de ne pas pouvoir implémenter ses idées. Ensuite, il essaya d'apprendre, mais les cours n'étaient pas assez rapides. Son colocataire, voulant se requalifier et arrêter d'apprendre, essaya Codecademy, mais \"s'ennuya.\" Chaque semaine un nouvel ami commença Codecademy, puis abandonna. Nous nous sommes rendus compte que nous avions résolu le même problème avec Skritter: les gens apprennant grâce à des cours lents et intensifs quand nous avons besoin d'expérience rapide et intensive. Nous savons comment remédier à ça."
     why_paragraph_2: "Besoin d'apprendre à développer? Vous n'avez pas besoin de cours. Vous avez besoin d'écrire beaucoup de code et de vous amuser en le faisant."
     why_paragraph_3_prefix: "C'est ce dont il s'agit en programmation. Ca doit être amusant. Pas amusant comme"
     why_paragraph_3_italic: "génial un badge"
@@ -300,7 +274,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     why_ending_url: "Commence ton apprentissage maintenant!"
     george_description: "PDG, homme d'affaire, web designer, game designer, et champion des programmeurs débutants."
     scott_description: "Programmeur extraordinaire, architecte logiciel, assistant cuisinier, et maitre de la finance. Scott est le raisonnable."
-    nick_description: "Assistant programmeur, mage à la motivation excentrique, et technicien sans dessus-dessous. Nick peut faire n'importe quoi mais il a choisi CodeCombat."
+    nick_description: "Assistant programmeur, mage à la motivation excentrique, et bidouilleur de l'extrême. Nick peut faire n'importe quoi mais il a choisi CodeCombat."
     jeremy_description: "Mage de l'assistance client, testeur de maniabilité, et community manager; vous avez probablement déjà parlé avec Jeremy."
     michael_description: "Programmeur, administrateur réseau, et l'enfant prodige du premier cycle, Michael est la personne qui maintient nos serveurs en ligne."
 
@@ -367,6 +341,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 
   contribute:
     page_title: "Contribution"
+#    character_classes_title: "Character Classes"
     introduction_desc_intro: "Nous avons beaucoup d'espoir pour CodeCombat."
     introduction_desc_pref: "Nous voulons être l'endroit où les développeurs de tous horizons viennent pour apprendre et jouer ensemble, présenter les autres au monde du développement, et refléter le meilleur de la communauté. Nous ne pouvons et ne voulons pas faire ça seuls ; ce qui rend super les projets comme GitHub, Stack Overflow et Linux, est que les gens qui l'utilisent le construisent. Dans ce but, "
     introduction_desc_github_url: "CodeCombat est totalement open source"
@@ -390,7 +365,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     join_url_email: "Contactez nous"
     join_url_hipchat: "conversation publique HipChat"
     more_about_archmage: "En apprendre plus sur devenir un puissant archimage"
-    archmage_subscribe_desc: "Obtenir des emails sur les nouvelles possibilités de développement et des annonces."
+    archmage_subscribe_desc: "Recevoir un email sur les nouvelles possibilités de développement et des annonces."
     artisan_introduction_pref: "Nous devons créer des niveaux additionnels! Les gens veulent plus de contenu, et nous ne pouvons pas tous les créer nous-mêmes. Maintenant votre station de travail est au niveau un ; notre éditeur de niveaux est à peine utilisable même par ses créateurs, donc méfiez-vous. Si vous avez des idées sur la boucle for de"
     artisan_introduction_suf: "cette classe est faite pour vous."
     artisan_attribute_1: "Une expérience dans la création de contenu comme celui-ci serait un plus, comme utiliser l'éditeur de niveaux de Blizzard. Mais ce n'est pas nécessaire!"
@@ -402,15 +377,15 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     artisan_join_step3: "Retrouvez nous dans notre conversation HipChat pour obtenir de l'aide."
     artisan_join_step4: "Postez vos niveaux dans le forum pour avoir des retours."
     more_about_artisan: "En apprendre plus sur comment devenir un Artisan créatif"
-    artisan_subscribe_desc: "Recevoir des emails sur les annonces et mises à jour de l'éditeur de niveaux."
+    artisan_subscribe_desc: "Recevoir un email sur les annonces et mises à jour de l'éditeur de niveaux."
     adventurer_introduction: "Soyons clair à propos de votre rôle : vous êtes le tank. Vous allez subir beaucoup de dommages. Nous avons besoin de gens pour essayer les nouveaux niveaux et aider à identifier comment améliorer les choses. La douleur sera énorme; faire de bons jeux est une longue tâche et personne n'y arrive du premier coup. Si vous pouvez résister et avez un gros score de constitution, alors cette classe est faite pour vous."
     adventurer_attribute_1: "Une soif d'apprendre. Vous voulez apprendre à développer et nous voulons vous apprendre. Vous allez toutefois faire la plupart de l'apprentissage."
     adventurer_attribute_2: "Charismatique. Soyez doux mais exprimez-vous sur ce qui a besoin d'être amélioré, et faites des propositions sur comment l'améliorer."
-    adventurer_join_pref: "Soit être ensemble avec (ou recruter!) un artisan et travailler avec lui, ou cocher la case ci-dessous pour recevoir des emails quand il y aura de nouveaux niveaux à tester. Nous parlons aussi des niveaux à réviser sur notre réseau"
+    adventurer_join_pref: "Soit être ensemble avec (ou recruter!) un artisan et travailler avec lui, ou cocher la case ci-dessous pour recevoir un email quand il y aura de nouveaux niveaux à tester. Nous parlons aussi des niveaux à réviser sur notre réseau"
     adventurer_forum_url: "notre forum"
     adventurer_join_suf: "si vous préférez être avertis ainsi, inscrivez-vous ici!"
     more_about_adventurer: "En apprendre plus sur devenir un Aventurier brave"
-    adventurer_subscribe_desc: "Recevoir un email lorqu'il y a de nouveaux niveaux à tester."
+    adventurer_subscribe_desc: "Recevoir un email lorsqu'il y a de nouveaux niveaux à tester."
     scribe_introduction_pref: "CodeCombat n'est pas seulement un paquet de niveaux. Il contiendra aussi des ressources pour la connaissance, un wiki des concepts de programmation que les niveaux pourront illustrer. Dans ce but, chaque Artisan pourra, au lieu d'avoir à décrire en détail ce qu'est un opérateur de comparaison, seulement lier son niveau à l'article qui le décrit et qui a été écrit pour aider les joueurs. Quelque chose dans le sens de ce que le "
     scribe_introduction_url_mozilla: "Mozilla Developer Network"
     scribe_introduction_suf: " a développé. Si votre représentation de l'amusement est l'articulation des concepts de programmation au format Markdown, alors cette classe est pour vous."
@@ -418,7 +393,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     contact_us_url: "Contactez-nous"
     scribe_join_description: "parlez nous un peu de vous, de votre expérience en programmation et de quels sujets vous souhaitez traiter. Nous partirons de là!"
     more_about_scribe: "En apprendre plus sur comment devenir un Scribe assidu"
-    scribe_subscribe_desc: "Recevoir des emails sur les annonces d'écriture d'article."
+    scribe_subscribe_desc: "Recevoir un email sur les annonces d'écriture d'article."
     diplomat_introduction_pref: "Si nous avons appris quelque chose du "
     diplomat_launch_url: "lancement en octobre"
     diplomat_introduction_suf: "c'est qu'il y a un intérêt considérable pour CodeCombat dans d'autres pays, particulièrement au Brésil! Nous créons une équipe de traducteurs pour changer une liste de mots en une autre pour que CodeCombat soit le plus accessible possible à travers le monde. Si vous aimez avoir des aperçus des prochains contenus et avoir les niveaux dans votre langue le plus tôt possible, alors cette classe est faite pour vous."
@@ -427,14 +402,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     diplomat_doc_url: "ce post du forum"
     diplomat_join_suf: "regardez les et ajoutez des choses à votre langue. Aussi, cochez la case ci-dessous pour rester à jour sur les nouveaux développement d'i18n!"
     more_about_diplomat: "En apprendre plus sur comment devenir un bon diplomate"
-    diplomat_subscribe_desc: "Recevoir des emails sur le développement i18n et les niveaux à traduire."
+    diplomat_subscribe_desc: "Recevoir un email sur le développement i18n et les niveaux à traduire."
     ambassador_introduction: "C'est la communauté que nous avons construite, et vous en êtes les connexions. Nous avons une discussion Olark, des emails et les réseaux sociaux avec plusieurs personnes avec qui parler, et l'aide vient à la fois du jeu lui-même et grâce à lui. Si vous voulez aider les gens, prendre part à l'aventure et vous amusez, avec un bon feeling de CodeCombat et de là où nous allons, alors cette classe est faite pour vous."
     ambassador_attribute_1: "Compétences en communication. Être capable d'identifier les problèmes que les joueurs ont et les aider à les résoudre. Mais aussi nous garder informés de ce que les joueurs disent, ce qu'ils aiment et n'aiment pas et d'autres choses de ce type!"
     ambassador_join_desc: "parlez-nous un peu de vous, de ce que vous avez fait et ce qui vous aimeriez faire. Nous partirons de ça!"
     ambassador_join_note_strong: "Note"
     ambassador_join_note_desc: "Une de nos priorités est de développer un jeu multijoueur où les joueurs qui ont du mal à réussir un niveau peuvent demander de l'aide à un joueur de plus haut niveau. Ce sera un bon moyen pour que les ambassadeurs fassent leur travail. Nous vous garderons en ligne!"
     more_about_ambassador: "En apprendre plus sur comment devenir un Ambassadeur serviable"
-    ambassador_subscribe_desc: "Recevoir des emails sur les mises à jour de l'aide et les développements multijoueur."
+    ambassador_subscribe_desc: "Recevoir un email sur les mises à jour de l'aide et les développements multijoueur."
     counselor_introduction_1: "Avez-vous une expérience de vie? Ou toute autre expérience qui peut nous aider à décider comment diriger CodeCombat? De tous ces rôles, ce sera probablement celui qui prend le moins de temps, mais vous ferez la différence. Nous recherchons des sages, particulièrement dans les domaines de : l'apprentissage, le développement de jeux, la gestion de projets open source, le recrutement technique, l'entreprenariat, ou la conception."
     counselor_introduction_2: "Ou vraiment toute chose en rapport avec le développement de CodeCombat. Si vous avez des connaissances et que vous voulez les partager pour aider le projet à avancer, alors cette classe est faite pour vous."
     counselor_attribute_1: "De l'expérience, dans un des domaines ci-dessus ou quelque chose que vous pensez utile."
@@ -457,9 +432,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     adventurer_title: "Aventurier"
     adventurer_title_description: "(Testeur de jouabilité)"
     scribe_title: "Scribe"
-    scribe_title_description: "(Editeur d'article)"
+    scribe_title_description: "(Éditeur d'article)"
     diplomat_title: "Diplomate"
-    diplomat_title_description: "(Tarducteur)"
+    diplomat_title_description: "(Traducteur)"
     ambassador_title: "Ambassadeur"
     ambassador_title_description: "(Aide)"
     counselor_title: "Conseiller"

app/locale/he.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/hi.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/hu.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", translation:
   common:
     loading: "Töltés..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Mentés..."
+    sending: "Küldés..."
+    cancel: "Mégse"
+    save: "Mentés"
+    delay_1_sec: "1 másodperc"
+    delay_3_sec: "2 másodperc"
+    delay_5_sec: "3 másodperc"
+    manual: "Kézi"
+#    fork: "Fork"
+    play: "Játék"
 
   modal:
     close: "Mégse"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     page_not_found: "Az oldal nem található"
 
   nav:
-    sign_up: "Regisztráció"
-    log_in: "Bejelentkezés"
-    log_out: "Kijelentkezés"
     play: "Játék"
     editor: "Szerkesztő"
     blog: "Blog"
@@ -28,59 +33,49 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     twitter_follow: "Követés"
 #    employers: "Employers"
 
-  forms:
-    name: "Név"
-    email: "Email cím"
-    message: "Üzenet"
-    cancel: "Mégse"
-#    save: "Save"
-
-#  versions:
-#    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+  versions:
+    save_version_title: "Új verzió mentése"
+    new_major_version: "Új főverzió"
+    cla_prefix: "A módosítások elmentéséhez el kell fogadnod a "
+    cla_url: "CLA"
+    cla_suffix: "tartalmát."
+    cla_agree: "ELFOGADOM"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Regisztráció"
     log_in: "Bejelentkezés"
-    sign_up: "Új fiók regisztrálása"
-    or: ", vagy "
-    recover: "meglévő fiók visszaéllítása"
+    log_out: "Kijelentkezés"
+    recover: "meglévő fiók visszaállítása"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Meglévő fiók visszaállítása"
 
   signup:
 #    create_account_title: "Create Account to Save Progress"
-    description: "Teljesen ingyenes. Csak néhány dologra lesz szükségünk, s kezdheted is:"
+    description: "Teljesen ingyenes. Csak néhány dologra lesz szükségünk és már kezdheted is a játékot:"
     email_announcements: "Szeretnél kapni hírlevelet?"
-    coppa: "13 elmúltál? (Vagy az USA-n kívül élsz?)"
+    coppa: "Elmúltál már 13? (Vagy az USA-n kívül élsz?)"
     coppa_why: "(Miért?)"
     creating: "Fiók létrehozása"
     sign_up: "Regisztráció"
-    or: "vagy "
     log_in: "belépés meglévő fiókkal"
 
   home:
     slogan: "Tanulj meg JavaScript nyelven programozni, miközben játszol!"
-    no_ie: "A CodeCombat nem fut Internet Explorer 9, vagy idősebb böngészőben. Bocsi!"
+    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átsz!"
+    play: "Játssz!"
 
   play:
     choose_your_level: "Válaszd ki a pályát!"
     adventurer_prefix: "Továbbugorhatsz bármelyik pályára, amit lent látsz. Vagy megbeszélheted a pályát a többiekkel "
-    adventurer_forum: "a Kalandozók Fórumá"
-    adventurer_suffix: " n."
+#   fixed separation
+    adventurer_forum: "a Kalandozók Fórumán"
+    adventurer_suffix: "."
     campaign_beginner: "Kezdő Kampány"
     campaign_beginner_description: "... amelyben megtanulhatod a programozás varázslatait."
     campaign_dev: "Véletlenszerű Nehezebb Pályák"
-    campaign_dev_description: "... amelyben egy kicsit nehezebb dolgokkat nézhetsz szembe."
+    campaign_dev_description: "... amelyben egy kicsit nehezebb dolgokkal nézhetsz szembe."
     campaign_multiplayer: "Multiplayer Arénák"
     campaign_multiplayer_description: "... amelyben a kódod nekifeszülhet más játékosok kódjának"
     campaign_player_created: "Játékosok pályái"
@@ -96,20 +91,19 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     forum_prefix: "Ha publikus dologról van szó, megpróbálhatod a "
     forum_page: "fórumban"
     forum_suffix: " is."
-    sending: "Küldés..."
     send: "Visszajelzés küldése"
 
   diplomat_suggestion:
     title: "Segítsd lefordítani a CodeCombat-ot!"
     sub_heading: "Szükségünk van a segítségedre!"
-    pitch_body: "Az oldalt angol nyelven fejlesztettük, de máris rengeteg játékosunk van szerte a világból. Nagyon sokan szeretnének közülük magyarul játszani, s nem beszélnek angolul. Ha te beszélsz angolul is, magyarul is, kérlek jelentkezz Diplomatának, s segíts lefordítani mind a honlapot, mind a pályákat magyarra."
+    pitch_body: "Az oldalt angol nyelven fejlesztettük, de máris rengeteg játékosunk van szerte a világban. Nagyon sokan szeretnének közülük magyarul játszani, de nem beszélnek angolul. Ha te beszélsz angolul is, magyarul is, kérlek jelentkezz Diplomatának, s segíts lefordítani mind a honlapot, mind a pályákat magyarra."
     missing_translations: "Addig, amíg nincs minden lefordítva magyarra, angol szöveget fogsz látni ott, ahol még nincs fordítás."
     learn_more: "Tudj meg többet a Diplomatákról!"
     subscribe_as_diplomat: "Jelentkezz Diplomatának"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
+  wizard_settings:
+    title: "Varázsló beállításai"
+    customize_avatar: "Állítsd be az Avatarod!"
 
   account_settings:
     title: "Fiók beállítások"
@@ -121,20 +115,20 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     password_tab: "Jelszó"
     emails_tab: "Levelek"
     gravatar_select: "Válassz egy Gravatar képet!"
-    gravatar_add_photos: "Adj képeket a Gravatar fiókodhoz, hogy választhass képeket."
+    gravatar_add_photos: "Adj képeket a Gravatar fiókodhoz"
     gravatar_add_more_photos: "Adj több képet a Gravatar fiókodhoz, hogy itt is elérd őket"
     wizard_color: "Varázslód színe"
     new_password: "Új jelszó"
     new_password_verify: "Mégegyszer"
     email_subscriptions: "Hírlevél feliratkozások"
     email_announcements: "Bejelentések"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Szeretnél levelet kapni a legújabb fejlesztéseinkről?"
     contributor_emails: "Hozzájárulóknak szóló levelek"
     contribute_prefix: "Folyamatosan keresünk embereket, hogy csatlakozzanak hozzánk. Nézz rá a "
     contribute_page: "segítők oldalára"
     contribute_suffix: " információkért."
-    email_toggle: "Az összes megjelőlése"
-    saving: "Mentés..."
+    email_toggle: "Az összes megjelölése"
     error_saving: "Hiba a mentés során"
     saved: "Változtatások elmentve"
     password_mismatch: "A jelszavak nem egyeznek."
@@ -144,14 +138,14 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    profile_for_prefix: "Profile for "
 #    profile_for_suffix: ""
     profile: "Profil"
-#    user_not_found: "No user found. Check the URL?"
+    user_not_found: "Nincs ilyen felhasználó! Jó az URL?"
     gravatar_not_found_mine: "Nem találtunk profilt ezzel a címmel:"
 #    gravatar_not_found_email_suffix: "."
-    gravatar_signup_prefix: "Regisztrálj a "
+    gravatar_signup_prefix: "Regisztrálj az "
     gravatar_signup_suffix: " oldalon!"
-#    gravatar_not_found_other: "Alas, there's no profile associated with this person's email address."
-#    gravatar_contact: "Contact"
-#    gravatar_websites: "Websites"
+#    gravatar_not_found_other: "Nem találtunk profilt ezzel a címmel:"
+    gravatar_contact: "Kapcsolat"
+    gravatar_websites: "Weboldalak"
 #    gravatar_accounts: "As Seen On"
 #    gravatar_profile_link: "Full Gravatar Profile"
 
@@ -165,7 +159,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     multiplayer: "Többjátékos"
     restart: "Előről"
     goals: "Célok"
-    action_timeline: "Tettvonal"
+    action_timeline: "Akció - Idővonal" # or "Tettvonal" #   "Tettvonal" sounds like "line of a crime" or something. "Akció idővonal" a little better but even not the best. I'll think about it later (csuvasregal - Sárosi Gergely)
     click_to_select: "Kattints egy egységre, hogy kijelöld!"
     reload_title: "Újra kezded mindet?"
     reload_really: "Biztos vagy benne, hogy előről szeretnéd kezdeni az egész pályát?"
@@ -173,7 +167,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    victory_title_prefix: ""
     victory_title_suffix: "Kész"
     victory_sign_up: "Regisztrálj a friss infókért"
-    victory_sign_up_poke: "Szeretnéd, ha levelet küldenénk neked az újításokról? Regisztrálj ingyen egy fiókot, s nem maradsz le semmirtől!"
+    victory_sign_up_poke: "Szeretnéd, ha levelet küldenénk neked az újításokról? Regisztrálj ingyen egy fiókot, és nem maradsz le semmirtől!"
     victory_rate_the_level: "Értékeld a pályát: "
     victory_play_next_level: "Következő pálya"
     victory_go_home: "Vissza a kezdőoldalra"
@@ -181,26 +175,23 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     victory_hour_of_code_done: "Készen vagy?"
     victory_hour_of_code_done_yes: "Igen, ez volt életem kódja!"
     multiplayer_title: "Többjátékos beállítások"
-    multiplayer_link_description: "Add oda ezt a linket bárkinek, s csatlakozhatnak hozzád."
+    multiplayer_link_description: "Add oda ezt a linket bárkinek, és csatlakozhatnak hozzád."
     multiplayer_hint_label: "Tipp:"
-    multiplayer_hint: " Kattints a linkre, s Ctrl+C-vel (vagy ⌘+C-vel) másold a vágólapra!"
-    multiplayer_coming_soon: "További beállítások érkeznek hamarosan!"
-#    guide_title: "Guide"
-#    tome_minion_spells: "Your Minions' Spells"
-#    tome_read_only_spells: "Read-Only Spells"
-#    tome_other_units: "Other Units"
+    multiplayer_hint: " Kattints a linkre, és Ctrl+C-vel (vagy ⌘+C-vel) másold a vágólapra!"
+    mltiplayer_coming_soon: "További beállítások,hamarosan!"
+    guide_title: "Útmutató"
+    tome_minion_spells: "Egységeid varázslatai"
+    tome_read_only_spells: "Csak olvasható varázslatok"
+    tome_other_units: "Egyéb egységek"
 #    tome_cast_button_castable: "Cast"
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
-#    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
-#    tome_select_spell: "Select a Spell"
-#    tome_select_a_thang: "Select Someone for "
-#    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+    tome_autocast_delay: "Auto varázslás késleltetés"
+    tome_select_spell: "Válassz egy varázslatot"
+    tome_select_a_thang: "Válassz ki valakit "
+    tome_available_spells: "Elérhető varázslatok"
+    hud_continue: "Folytatás (shift+space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -212,72 +203,58 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    u_title: "User List"
 #    lg_title: "Latest Games"
 
-#  editor:
-#    main_title: "CodeCombat Editors"
-#    main_description: "Build your own levels, campaigns, units and educational content. We provide all the tools you need!"
-#    article_title: "Article Editor"
-#    article_description: "Write articles that give players overviews of programming concepts which can be used across a variety of levels and campaigns."
-#    thang_title: "Thang Editor"
-#    thang_description: "Build units, defining their default logic, graphics and audio. Currently only supports importing Flash exported vector graphics."
-#    level_title: "Level Editor"
-#    level_description: "Includes the tools for scripting, uploading audio, and constructing custom logic to create all sorts of levels. Everything we use ourselves!"
-#    security_notice: "Many major features in these editors are not currently enabled by default. As we improve the security of these systems, they will be made generally available. If you'd like to use these features sooner, "
-#    contact_us: "contact us!"
-#    hipchat_prefix: "You can also find us in our"
-#    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
-#    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
-#    level_tab_thangs: "Thangs"
-#    level_tab_scripts: "Scripts"
-#    level_tab_settings: "Settings"
-#    level_tab_components: "Components"
-#    level_tab_systems: "Systems"
-#    level_tab_thangs_title: "Current Thangs"
-#    level_tab_thangs_conditions: "Starting Conditions"
-#    level_tab_thangs_add: "Add Thangs"
-#    level_settings_title: "Settings"
-#    level_component_tab_title: "Current Components"
-#    level_component_btn_new: "Create New Component"
-#    level_systems_tab_title: "Current Systems"
-#    level_systems_btn_new: "Create New System"
-#    level_systems_btn_add: "Add System"
-#    level_components_title: "Back to All Thangs"
-#    level_components_type: "Type"
-#    level_component_edit_title: "Edit Component"
-#    level_system_edit_title: "Edit System"
-#    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
-#    new_component_title: "Create New Component"
-#    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
+  editor:
+    main_title: "CodeCombat szerkesztők"
+    main_description: "Készíts saját pályákat, hadjáratokat, egységeket és oktatési célú tartalmakat. Mi megadunk hozzá minden eszközt amire csak szükséged lehet!"
+    article_title: "Cikk szerkesztő"
+    article_description: "Írhatsz cikkeket, hogy átfogó képet adhass olyan programozási szemléletekről, melyeket a különböző pályákon és küldetések során felhasználhatnak."
+    thang_title: "Eszköz szerkesztő"
+    thang_description: "Építs egységeket, határozd meg az működésüket, kinézetüket és hangjukat. Jelenleg csak a Flash-ből exportált vektorgrafika támogatott."
+    level_title: "Pálya szerkesztő"
+    level_description: "Mindent magába foglal, ami kódolás, hangok feltöltése, és a pályák teljesen egyedi felépítése. Minden, amit mi használunk!"
+    security_notice: "Számos főbb funkció ezekben a szerkesztőkben még nincs engedélyezve alapesetben. Amint a rendszer biztonságát növelni tudjuk, elérhetővé teszzük ezeket. Ha a későbbiekben használni szeretnéf ezeket a funkciókat, "
+    contact_us: "lépj kapcsolatba velünk!"
+    hipchat_prefix: "Megtalálhatsz bennünket a "
+    hipchat_url: "HipChat szobában."
+    level_some_options: "Néhány beállítás?"
+    level_tab_thangs: "Eszközök"
+    level_tab_scripts: "Kódok"
+    level_tab_settings: "Beállítások"
+    level_tab_components: "Komponensek"
+    level_tab_systems: "Rendszerek"
+    level_tab_thangs_title: "Jelenlegi eszközök"
+    level_tab_thangs_conditions: "Kezdő feltételek"
+    level_tab_thangs_add: "Eszköz hozzáadása"
+    level_settings_title: "Beállítások"
+    level_component_tab_title: "Jelenlegi komponensek"
+    level_component_btn_new: "Új komponens készítése"
+    level_systems_tab_title: "Jelenlegi rendszerek"
+    level_systems_btn_new: "Új rendszer készítése"
+    level_systems_btn_add: "Rendszer hozzáadása"
+    level_components_title: "Vissza az összes eszközhöz"
+    level_components_type: "Típus"
+    level_component_edit_title: "Komponens szerkesztése"
+    level_system_edit_title: "Rendszer szerkesztése"
+    create_system_title: "Új rendszer készítése"
+    new_component_title: "Új komponens készítése"
+    new_component_field_system: "Rendszer"
 
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
+  article:
+    edit_btn_preview: "Előnézet"
+    edit_article_title: "Cikk szerkesztése"
 
-#  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
-#    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
-#    edit_article_title: "Edit Article"
-
-#  general:
-#    and: "and"
+  general:
+    and: "és"
+    or: "vagy "
+    name: "Név"
+#    body: "Body"
+#    version: "Version"
+    commit_msg: "Megjegyzés"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Email cím"
+    message: "Üzenet"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/id.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/it.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "italiano", englishDescription: "Italian", translation:
   common:
-    loading: "Caricamento..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    loading: "Caricamento in corso..."
+    saving: "Salvataggio in corso..."
+    sending: "Invio in corso..."
+    cancel: "Annulla"
+    save: "Salva"
+    delay_1_sec: "1 secondo"
+    delay_3_sec: "3 secondi"
+    delay_5_sec: "5 secondi"
+    manual: "Manuale"
+#    fork: "Fork"
+    play: "Gioca"
 
   modal:
     close: "Chiudi"
@@ -12,99 +20,85 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
     page_not_found: "Pagina non trovata"
 
   nav:
-    sign_up: "Crea Account"
-    log_in: "Accedi"
-    log_out: "Disconnetti"
     play: "Gioca"
     editor: "Editor"
     blog: "Blog"
     forum: "Forum"
     admin: "Admin"
-    home: "Pagina Iniziale"
+    home: "Pagina iniziale"
     contribute: "Contribuisci"
     legal: "Legale"
     about: "Informazioni"
     contact: "Contatti"
     twitter_follow: "Segui"
-#    employers: "Employers"
+    employers: "Impiegati"
 
-  forms:
-    name: "Nome"
-    email: "Email"
-    message: "Messaggio"
-    cancel: "Annulla"
-#    save: "Save"
-
-#  versions:
-#    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+  versions:
+    save_version_title: "Salva nuova versione"
+    new_major_version: "Nuova versione"
+    cla_prefix: "Per salvare le modifiche, prima devi accettare la nostra "
+    cla_url: "CLA"
+    cla_suffix: "."
+    cla_agree: "ACCETTO"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Crea account"
     log_in: "Accedi"
-    sign_up: "crea un nuovo account"
-    or: ", o "
-    recover: "recupera account"
+    log_out: "Disconnetti"
+    recover: "Recupera account"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Recupera account"
+    send_password: "Spedisci password di recupero"
 
   signup:
-#    create_account_title: "Create Account to Save Progress"
+    create_account_title: "Crea un accounto per salvare le partite"
     description: "È gratis. Servono solo un paio di dettagli:"
     email_announcements: "Ricevi comunicazioni per email"
     coppa: "13+ o non-USA"
     coppa_why: "(Perché?)"
-    creating: "Creando l'account..."
+    creating: "Creazione account..."
     sign_up: "Registrati"
-    or: "o "
     log_in: "accedi con password"
 
   home:
-    slogan: "Impara a Programmare in JavaScript Giocando"
-    no_ie: "CodeCombat non supporta IE8 o browser precedendi. Ci dispiace!"
+    slogan: "Impara a programmare in JavaScript giocando"
+    no_ie: "CodeCombat non supporta IE8 o browser precedenti. Ci dispiace!"
     no_mobile: "CodeCombat non è stato pensato per dispositivi mobili e potrebbe non funzionare!"
     play: "Gioca"
 
   play:
-    choose_your_level: "Scegli il Tuo Livello"
-    adventurer_prefix: "Puoi saltare a qualunque livello qui sotto, o scambiare opinioni sui livelli su "
-    adventurer_forum: "il forum degli Avventurieri"
+    choose_your_level: "Scegli il tuo livello"
+    adventurer_prefix: "Puoi saltare a qualunque livello qui sotto, o scambiare opinioni sui livelli sul"
+    adventurer_forum: "forum degli Avventurieri"
     adventurer_suffix: "."
-    campaign_beginner: "Campagna Facile"
-    campaign_beginner_description: "... nella quale imparerai i trucchi della programmazione."
-    campaign_dev: "Livelli Difficili Casuali"
+    campaign_beginner: "Campagne facili"
+    campaign_beginner_description: "... nelle quali imparerai i trucchi della programmazione."
+    campaign_dev: "Livelli difficili casuali"
     campaign_dev_description: "... nei quali imparerai a usare l'interfaccia facendo qualcosa di un po' più difficile."
-    campaign_multiplayer: "Arene Multigiocatore"
+    campaign_multiplayer: "Arene multigiocatore"
     campaign_multiplayer_description: "... nelle quali programmi faccia a faccia contro altri giocatori."
-    campaign_player_created: "Creati dai Giocatori"
+    campaign_player_created: "Creati dai giocatori"
     campaign_player_created_description: "... nei quali affronterai la creatività dei tuoi compagni <a href=\"/contribute#artisan\">Stregoni Artigiani</a>."
     level_difficulty: "Difficoltà: "
 
   contact:
     contact_us: "Contatta CodeCombat"
-    welcome: "È bello sentirti! Usa questo form per mandarci un'email."
+    welcome: "È bello sentirti! Usa questo modulo per mandarci un'email."
     contribute_prefix: "Se sei interessato a contribuire, dai un'occhiata alla nostra "
     contribute_page: "pagina dei contributi"
     contribute_suffix: "!"
     forum_prefix: "Per discussioni pubbliche, puoi provare "
     forum_page: "il nostro forum"
     forum_suffix: " invece."
-    sending: "Invio in corso..."
-    send: "Invia Feedback"
+    send: "Invia feedback"
 
   diplomat_suggestion:
     title: "Aiuta a tradurre CodeCombat!"
     sub_heading: "Abbiamo bisogno di traduttori."
-    pitch_body: "Noi sviluppiamo CodeCombat in Inglese, ma abbiamo già giocatori in tutto il mondo. Molti di loro vorrebbero giocare in Italiano ma non parlano Inglese, quindi se tu sai parlarli entrambi sarebbe fantastico se decidessi di diventare un Diplomatico ed aiutassi a tradurre sia il sito di CodeCombat che tutti i livelli in Italiano."
-    missing_translations: "Finché non riusciamo a tradurre tutto in Italiano vedrai alcune parti in Inglese dove l'Italiano non è disponibile."
-    learn_more: "Maggiori dettagli sull'essere un Diplomatico"
+    pitch_body: "Noi sviluppiamo CodeCombat in inglese, ma abbiamo già giocatori in tutto il mondo. Molti di loro vorrebbero giocare in italiano, ma non parlano inglese, quindi se tu li conosci entrambi sarebbe fantastico se decidessi di diventare un Diplomatico ed aiutassi a tradurre sia il sito di CodeCombat che tutti i livelli in italiano."
+    missing_translations: "Finché non riusciamo a tradurre tutto in italiano vedrai alcune parti in inglese, dove l'italiano non è disponibile."
+    learn_more: "Maggiori dettagli su cosa vuol dire essere un Diplomatico"
     subscribe_as_diplomat: "Diventa un Diplomatico"
 
 #  wizard_settings:
@@ -112,36 +106,36 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
 #    customize_avatar: "Customize Your Avatar"
 
   account_settings:
-    title: "Impostazioni Account"
+    title: "Impostazioni account"
     not_logged_in: "Accedi o crea un account per cambiare le tue impostazioni."
-    autosave: "Modifiche Salvate Automaticamente"
+    autosave: "Modifiche salvate automaticamente"
     me_tab: "Io"
     picture_tab: "Immagine"
     wizard_tab: "Stregone"
     password_tab: "Password"
     emails_tab: "Email"
     gravatar_select: "Seleziona quale foto di Gravatar usare"
-    gravatar_add_photos: "Aggiungi delle immagini all'account di Gravatar per la tua email per scegliare un'immagine."
+    gravatar_add_photos: "Aggiungi delle immagini all'account di Gravatar per la tua email per scegliere un'immagine."
     gravatar_add_more_photos: "Aggiungi più foto al tuo account di Gravatar per vederle qui."
-    wizard_color: "Colore dei Vestiti da Stregone"
-    new_password: "Nuova Password"
+    wizard_color: "Colore dei vestiti da Stregone"
+    new_password: "Nuova password"
     new_password_verify: "Verifica"
-    email_subscriptions: "Sottoscrizioni Email"
+    email_subscriptions: "Sottoscrizioni email"
     email_announcements: "Annunci"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Ricevi email con le ultime novità e sviluppi a CodeCombat."
-    contributor_emails: "Email dei Collaboratori"
+    contributor_emails: "Email dei collaboratori"
     contribute_prefix: "Stiamo cercando persone che si uniscano al nostro gruppo! Dai un'occhiata alla "
     contribute_page: "pagina dei collaboratori"
     contribute_suffix: " per saperne di più."
-    email_toggle: "Attiva Tutti"
-    saving: "Salvando..."
-    error_saving: "Errore durante il Salvataggio"
-    saved: "Modifiche Salvate"
+    email_toggle: "Attiva tutti"
+    error_saving: "Errore durante il salvataggio"
+    saved: "Modifiche salvate"
     password_mismatch: "La password non corrisponde."
 
   account_profile:
-    edit_settings: "Modifica Impostazioni"
-    profile_for_prefix: "Profilo per "
+    edit_settings: "Modifica impostazioni"
+    profile_for_prefix: "Profilo di "
 #    profile_for_suffix: ""
     profile: "Profilo"
     user_not_found: "Utente non trovato. Forse l'URL è sbagliato."
@@ -151,140 +145,122 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
     gravatar_signup_suffix: " per impostare tutto!"
     gravatar_not_found_other: "A quanto pare non c'è un profilo associato con l'indirizzo email di questa persona."
     gravatar_contact: "Contatto"
-    gravatar_websites: "Siti Web"
+    gravatar_websites: "Siti web"
     gravatar_accounts: "Come su"
-    gravatar_profile_link: "Profilo Gravatar Completo"
+    gravatar_profile_link: "Profilo Gravatar completo"
 
   play_level:
     level_load_error: "Il livello non può essere caricato."
     done: "Fatto"
     grid: "Griglia"
-    customize_wizard: "Personalizza Stregone"
-    home: "Pagina Iniziale"
+    customize_wizard: "Personalizza stregone"
+    home: "Pagina iniziale"
     guide: "Guida"
     multiplayer: "Multigiocatore"
     restart: "Ricomincia"
     goals: "Obiettivi"
-    action_timeline: "Barra Temporale delle Azioni"
+    action_timeline: "Barra temporale delle azioni"
     click_to_select: "Clicca un'unità per selezionarla."
-    reload_title: "Ricarica tutto il Codice?"
+    reload_title: "Ricarica tutto il codice?"
     reload_really: "Sei sicuro di voler ricominciare il livello?"
-    reload_confirm: "Ricarica Tutto"
+    reload_confirm: "Ricarica tutto"
 #    victory_title_prefix: ""
     victory_title_suffix: " Completato"
-    victory_sign_up: "Registrati per Aggiornamenti"
+    victory_sign_up: "Registrati per gli aggiornamenti"
     victory_sign_up_poke: "Vuoi ricevere le ultime novità per email? Crea un account gratuito e ti terremo aggiornato!"
     victory_rate_the_level: "Vota il livello: "
-    victory_play_next_level: "Gioca il Prossimo Livello"
-    victory_go_home: "Torna alla Pagina Iniziale"
+    victory_play_next_level: "Gioca il prossimo livello"
+    victory_go_home: "Torna alla pagina iniziale"
     victory_review: "Dicci di più!"
     victory_hour_of_code_done: "Finito?"
-    victory_hour_of_code_done_yes: "Si, ho finito con la mia Ora di Programmazione!"
-    multiplayer_title: "Impostazioni Multigiocatore"
+    victory_hour_of_code_done_yes: "Si, ho finito con la mia ora di programmazione!"
+    multiplayer_title: "Impostazioni multigiocatore"
     multiplayer_link_description: "Dai questo link a chi vuoi che si unisca a te."
     multiplayer_hint_label: "Suggerimento:"
     multiplayer_hint: " Clicca il link per selezionare tutto, quindi premi CMD-C o Ctrl-C per copiare il link."
     multiplayer_coming_soon: "Ulteriori aggiunte per il multigiocatore in arrivo!"
     guide_title: "Guida"
-    tome_minion_spells: "Incantesimi dei tuoi Seguaci"
-    tome_read_only_spells: "Incantesimi in Sola-Lettura"
-    tome_other_units: "Altre Unità"
+    tome_minion_spells: "Incantesimi dei tuoi seguaci"
+    tome_read_only_spells: "Incantesimi in sola lettura"
+    tome_other_units: "Altre unità"
     tome_cast_button_castable: "Lancia"
     tome_cast_button_casting: "Lanciando"
     tome_cast_button_cast: "Incantesimi"
     tome_autocast_delay: "Ritardo di lancio"
-    tome_autocast_1: "1 secondo"
-    tome_autocast_3: "3 secondi"
-    tome_autocast_5: "5 secondi"
-    tome_autocast_manual: "Manuale"
-    tome_select_spell: "Seleziona un Incantesimo"
-    tome_select_a_thang: "Seleziona Qualcuno per "
-    tome_available_spells: "Incantesimi Disponibili"
-#    hud_continue: "Continue (press shift-space)"
+    tome_select_spell: "Seleziona un incantesimo"
+    tome_select_a_thang: "Seleziona qualcuno per "
+    tome_available_spells: "Incantesimi disponibili"
+    hud_continue: "Continua (premi Maiusc-Spazio)"
+#    spell_saved: "Spell Saved"
 
-#  admin:
-#    av_title: "Admin Views"
-#    av_entities_sub_title: "Entities"
-#    av_entities_users_url: "Users"
-#    av_entities_active_instances_url: "Active Instances"
-#    av_other_sub_title: "Other"
-#    av_other_debug_base_url: "Base (for debugging base.jade)"
-#    u_title: "User List"
-#    lg_title: "Latest Games"
+  admin:
+    av_title: "Vista amministratore"
+    av_entities_sub_title: "Entità"
+    av_entities_users_url: "Utenti"
+    av_entities_active_instances_url: "Istanze attive"
+    av_other_sub_title: "Altro"
+    av_other_debug_base_url: "Base (for debugging base.jade)"
+    u_title: "Lista utenti"
+    lg_title: "Ultime partite"
+  editor:
+    main_title: "Editor di CodeCombat"
+    main_description: "Costruisci i tuoi livelli, le tue campagne, unità e contenuti educativi. Ti forniamo tutti gli attrezzi necessari!"
+    article_title: "Modifica articolo"
+    article_description: "Scrivi degli articoli per dare ai giocatori indicazioni sui concetti di programmazione, da usare in vari livelli e campagne."
+    thang_title: "Modifica thang"
+    thang_description: "Costruisci unità di gioco, definendo la loro logica di base, la grafica e l'audio. Per il momento si può soltanto importare grafica vettoriale esportata da Flash."
+    level_title: "Modifica livello"
+    level_description: "Comprende gli attrezzi per programmare, inviare audio e costruire unità logiche personalizzate per creare qualsiasi tipo di livello. Tutto quello che noi stessi usiamo!"
+    security_notice: "Molte funzioni importanti in questi editor non sono ancora attive. Mano a mano che miglioreremo la sicurezza di questi sistemi, essi verranno messi a disposizione di tutti. Per usare queste funzioni al più presto, "
+    contact_us: "scrivici!"
+    hipchat_prefix: "Ci puoi anche trovare nella nostra"
+    hipchat_url: "stanza HipChat."
+    level_some_options: "Opzioni??"
+    level_tab_thangs: "Thangs"
+    level_tab_scripts: "Script"
+    level_tab_settings: "Impostazioni"
+    level_tab_components: "Componenti"
+    level_tab_systems: "Sistemi"
+    level_tab_thangs_title: "Thangs esistenti"
+    level_tab_thangs_conditions: "Condizioni iniziali"
+    level_tab_thangs_add: "Aggiungi thang"
+    level_settings_title: "Impostazioni"
+    level_component_tab_title: "Componenti esistenti"
+    level_component_btn_new: "Crea nuovo componente"
+    level_systems_tab_title: "Sistemi esistenti"
+    level_systems_btn_new: "Crea nuovo sistema"
+    level_systems_btn_add: "Aggiungi sistema"
+    level_components_title: "Torna all'elenco thangs"
+    level_components_type: "Tipo"
+    level_component_edit_title: "Modifica componente"
+    level_system_edit_title: "Modifica sistema"
+    create_system_title: "Crea nuovo sistema"
+    new_component_title: "Crea nuovo componente"
+    new_component_field_system: "Sistema"
 
-#  editor:
-#    main_title: "CodeCombat Editors"
-#    main_description: "Build your own levels, campaigns, units and educational content. We provide all the tools you need!"
-#    article_title: "Article Editor"
-#    article_description: "Write articles that give players overviews of programming concepts which can be used across a variety of levels and campaigns."
-#    thang_title: "Thang Editor"
-#    thang_description: "Build units, defining their default logic, graphics and audio. Currently only supports importing Flash exported vector graphics."
-#    level_title: "Level Editor"
-#    level_description: "Includes the tools for scripting, uploading audio, and constructing custom logic to create all sorts of levels. Everything we use ourselves!"
-#    security_notice: "Many major features in these editors are not currently enabled by default. As we improve the security of these systems, they will be made generally available. If you'd like to use these features sooner, "
-#    contact_us: "contact us!"
-#    hipchat_prefix: "You can also find us in our"
-#    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
-#    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
-#    level_tab_thangs: "Thangs"
-#    level_tab_scripts: "Scripts"
-#    level_tab_settings: "Settings"
-#    level_tab_components: "Components"
-#    level_tab_systems: "Systems"
-#    level_tab_thangs_title: "Current Thangs"
-#    level_tab_thangs_conditions: "Starting Conditions"
-#    level_tab_thangs_add: "Add Thangs"
-#    level_settings_title: "Settings"
-#    level_component_tab_title: "Current Components"
-#    level_component_btn_new: "Create New Component"
-#    level_systems_tab_title: "Current Systems"
-#    level_systems_btn_new: "Create New System"
-#    level_systems_btn_add: "Add System"
-#    level_components_title: "Back to All Thangs"
-#    level_components_type: "Type"
-#    level_component_edit_title: "Edit Component"
-#    level_system_edit_title: "Edit System"
-#    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
-#    new_component_title: "Create New Component"
-#    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
+  article:
+    edit_btn_preview: "Anteprima"
+    edit_article_title: "Modifica articolo"
 
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
+  general:
+    and: "e"
+    or: "o"
+    name: "Nome"
+    body: "Testo"
+    version: "Versione"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+    results: "Risultati"
+    description: "Descrizione"
+    email: "Email"
+    message: "Messaggio"
 
-#  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
-#    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
-#    edit_article_title: "Edit Article"
-
-#  general:
-#    and: "and"
-
-#  about:
-#    who_is_codecombat: "Who is CodeCombat?"
-#    why_codecombat: "Why CodeCombat?"
-#    who_description_prefix: "together started CodeCombat in 2013. We also created "
-#    who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters."
-#    who_description_ending: "Now it's time to teach people to write code."
+  about:
+    who_is_codecombat: "Chi c'è inCodeCombat?"
+    why_codecombat: "Perché CodeCombat?"
+    who_description_prefix: "insieme hanno iniziato CodeCombat nel 2013. Abbiamo anche creato "
+    who_description_suffix: "nel 2008, portandola al primo posto nelle applicazioni web e iOS per imparare a scrivere i caratteri cinesi e giapponesi."
+    who_description_ending: "Adesso è il momento di insegnare alla gente a scrivere codice."
 #    why_paragraph_1: "When making Skritter, George didn't know how to program and was constantly frustrated by his inability to implement his ideas. Afterwards, he tried learning, but the lessons were too slow. His housemate, wanting to reskill and stop teaching, tried Codecademy, but \"got bored.\" Each week another friend started Codecademy, then dropped off. We realized it was the same problem we'd solved with Skritter: people learning a skill via slow, intensive lessons when what they need is fast, extensive practice. We know how to fix that."
 #    why_paragraph_2: "Need to learn to code? You don't need lessons. You need to write a lot of code and have a great time doing it."
 #    why_paragraph_3_prefix: "That's what programming is about. It's gotta be fun. Not fun like"
@@ -301,69 +277,71 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
 
-#  legal:
-#    page_title: "Legal"
-#    opensource_intro: "CodeCombat is free to play and completely open source."
-#    opensource_description_prefix: "Check out "
-#    github_url: "our GitHub"
-#    opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See "
-#    archmage_wiki_url: "our Archmage wiki"
-#    opensource_description_suffix: "for a list of the software that makes this game possible."
-#    practices_title: "Respectful Best Practices"
-#    practices_description: "These are our promises to you, the player, in slightly less legalese."
-#    privacy_title: "Privacy"
-#    privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent."
-#    security_title: "Security"
-#    security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems."
-#    email_title: "Email"
-#    email_description_prefix: "We will not inundate you with spam. Through"
-#    email_settings_url: "your email settings"
-#    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
-#    cost_title: "Cost"
-#    cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:"
-#    recruitment_title: "Recruitment"
-#    recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life."
-#    url_hire_programmers: "No one can hire programmers fast enough"
-#    recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you"
-#    recruitment_description_italic: "a lot"
-#    recruitment_description_ending: "the site remains free and everybody's happy. That's the plan."
-#    copyrights_title: "Copyrights and Licenses"
-#    contributor_title: "Contributor License Agreement"
-#    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
-#    cla_url: "CLA"
-#    contributor_description_suffix: "to which you should agree before contributing."
-#    code_title: "Code - MIT"
-#    code_description_prefix: "All code owned by CodeCombat or hosted on codecombat.com, both in the GitHub repository or in the codecombat.com database, is licensed under the"
-#    mit_license_url: "MIT license"
-#    code_description_suffix: "This includes all code in Systems and Components that are made available by CodeCombat for the purpose of creating levels."
-#    art_title: "Art/Music - Creative Commons "
-#    art_description_prefix: "All common content is available under the"
-#    cc_license_url: "Creative Commons Attribution 4.0 International License"
-#    art_description_suffix: "Common content is anything made generally available by CodeCombat for the purpose of creating Levels. This includes:"
-#    art_music: "Music"
-#    art_sound: "Sound"
-#    art_artwork: "Artwork"
-#    art_sprites: "Sprites"
-#    art_other: "Any and all other non-code creative works that are made available when creating Levels."
-#    art_access: "Currently there is no universal, easy system for fetching these assets. In general, fetch them from the URLs as used by the site, contact us for assistance, or help us in extending the site to make these assets more easily accessible."
-#    art_paragraph_1: "For attribution, please name and link to codecombat.com near where the source is used or where appropriate for the medium. For example:"
-#    use_list_1: "If used in a movie or another game, include codecombat.com in the credits."
-#    use_list_2: "If used on a website, include a link near the usage, for example underneath an image, or in a general attributions page where you might also mention other Creative Commons works and open source software being used on the site. Something that's already clearly referencing CodeCombat, such as a blog post mentioning CodeCombat, does not need some separate attribution."
-#    art_paragraph_2: "If the content being used is created not by CodeCombat but instead by a user of codecombat.com, attribute them instead, and follow attribution directions provided in that resource's description if there are any."
-#    rights_title: "Rights Reserved"
-#    rights_desc: "All rights are reserved for Levels themselves. This includes"
-#    rights_scripts: "Scripts"
-#    rights_unit: "Unit configuration"
-#    rights_description: "Description"
-#    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_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."
+  legal:
+    page_title: "Questioni legali"
+    opensource_intro: "CodeCombat è gratuito da giocare e totalmente open source."
+    opensource_description_prefix: "Visita il "
+    github_url: "nostro GitHub"
+    opensource_description_center: "e aiutaci se vuoi! CodeCombat è fatto di molti progetti open-source, e a noi piacciono tutti. Vedi "
+    archmage_wiki_url: "il nostro wiki degli Arcimaghi"
+    opensource_description_suffix: "per trovare un elenco dei software che rendono possibile questo gioco."
+    practices_title: "Buone pratiche di rispetto"
+    practices_description: "Queste sono le promesse che ti facciamo, come giocatore, in linguaggio un po' meno legale."
+    privacy_title: "Privacy"
+    privacy_description: "Non venderemo le tue info personali. Intendiamo far soldi eventualmente tramite assunzioni, ma sta' sicuro che non distribuiremo le tue info personali a ditte interessate senza il tuo consenso esplicito."
+    security_title: "Sicurezza"
+    security_description: "Facciamo tutto il possibile per tenere sicure le tue informazioni. Essendo un progetto open source, il nostro sito è aperto liberamente a chiunque per controllare e migliorare i nostri sistemi di sicurezza."
+    email_title: "Email"
+    email_description_prefix: "Non ti inonderemo di spam. Con le "
+    email_settings_url: "tue impostazioni di posta"
+    email_description_suffix: "o con i link contenuti nei messaggi puoi cambiare le tue preferenze o cancellarti facilmente in qualsiasi momento."
+    cost_title: "Costi"
+    cost_description: "In questo momento CodeCombat è totalmente gratis! Uno dei nostri obiettivi principali è di mantenerlo così, in modo che più persone possibile ci possano giocare, in qualsiasi condizione. Se le cose si mettessero male, potremmo essere costretti a far pagare l'iscrizione ad alcuni contenuti; ma preferiremmo di no. In ogni caso saremo in grado di sostenere la ditta con:"
+    recruitment_title: "Assunzioni"
+    recruitment_description_prefix: "Qui in CodeCombat, diventerai un vero mago - non solo nel gioco, ma anche nella vita reale."
+    url_hire_programmers: "Nessuno riesce a trovare abbastanza programmatori"
+    recruitment_description_suffix: "quindi quando avrai perfezionato le tue capacità, se sei d'accordo, invieremo dei campioni dei tuoi migliori risultati di programmazione a qualcuna delle migliaia di ditte che muoiono dalla voglia di assumerti. Ci pagheranno qualcosa, ti pagheranno"
+    recruitment_description_italic: "tantissimo"
+    recruitment_description_ending: "il sito resta gratuito e tutti siamo contenti. Ecco il progetto."
+    copyrights_title: "Diritti e licenze"
+    contributor_title: "Accordo di licenza per i contributori (CLA)"
+    contributor_description_prefix: "Tutti i contributi, qui sul sito e sul deposito GitHub, sono soggetti al nostro"
+    cla_url: "CLA"
+    contributor_description_suffix: "al quale devi dare consenso prima di iniziare a collaborare."
+    code_title: "Codice - MIT"
+    code_description_prefix: "Tutto il codice posseduto da CodeCombat o posto su codecombat.com, sia sul deposito GitHub che nel database codecombat.com è licenziato con la"
+    mit_license_url: "licenza MIT"
+    code_description_suffix: "Ciò comprende tutto il codice in Sistemi e Componenti che è reso disponibile da CodeCombat allo scopo di creare nuovi livelli."
+    art_title: "Grafica/musica - Creative Commons"
+    art_description_prefix: "Tutti i contenuti comuni sono resi disponibili con la" 
+    cc_license_url: "Creative Commons Attribution 4.0 International License"
+    art_description_suffix: "I contenuti comuni sono quelli resi disponibili da CodeCombat allo scopo di creare livelli. Ciò include:"
+    art_music: "Musica"
+    art_sound: "Suoni"
+    art_artwork: "Grafica"
+    art_sprites: "Sprite"
+    art_other: "Tutti gli altri lavori creativi di qualsiasi tipo - ma non di codice - resi disponibili durante la creazione dei livelli."
+    art_access: "Attualmente non c'è un modo semplice e unico di trovare queste risorse. In generale, li puoi trovare usando gli URL come succede nel nostro sito. Oppure contattaci per assistenza, oppure aiutaci ad ampliare il sito per rendere le risorse più facilmente accessibili."
+    art_paragraph_1: "Per l'attribuzione dei diritti, cita codecombat.com e metti un link nelle vicinanze della risorsa usata o dove è appropriato per l'oggetto in questione."
+    use_list_1: "Se usato in un video o in un altro gioco, inserire codecombat.com nei crediti."
+    use_list_2: "Se usato in un sito, inserire un link vicino alla risorsa; ad esempio sotto un'immagine, oppure in una apposita pagina di crediti dove potresti anche menzionare altri lavori CC e programmi OS usati nel sito. Se qualcosa fa già chiaro riferimento a CodeCombat, ad esempio un testo di blog che cita CodeCombat, non è necessario attribuire i crediti separatamente."
+#    art_paragraph_2: "Se il contenuto utilizzato non è stato creato da CodeCombat ma da un utente di codecombat.com, attribuiscilo a lui e segui le indicazioni dei crediti contenute nella descrizione di quella risorsa (se ci sono)."
+    rights_title: "Diritti riservati"
+    rights_desc: "Per i livelli stessi, tutti i diritti sono riservati. Ciò comprende"
+    rights_scripts: "Script"
+    rights_unit: "Configurazione di unità di gioco"
+    rights_description: "Descrizioni"
+    rights_writings: "Testi"
+    rights_media: "Media (suoni, musica) ed alti contenuti creativi prodotti appositamente per quel livello e non messi a disposizione generale per la creazione dei livelli."
+    rights_clarification: "Per chiarire, qualsiasi cosa sia messa a disposizione nell'Editor livelli allo scopo di creare livelli è in licenza CC, mentre i contenuti creati nell'Editor livelli o inviati nel corso della creazione non lo sono."
+    nutshell_title: "In poche parole"
+    nutshell_description: "Qualsiasi risorsa che inseriamo nell'Editor livelli è di libero uso per la creazione dei livelli. Ci riserviamo però il diritto di limitare la distribuzione dei livelli stessi (creati su codecombat.com) che quindi potranno essere a pagamento in futuro, se questo è ciò che finirà per succedere."
+    canonical: "La versione inglese di questo documento è quella che fa fede. Se ci sono discrepanze tra le traduzioni, la versione inglese ha la precedenza."
 
-#  contribute:
-#    page_title: "Contributing"
+
+  contribute:
+    page_title: "Contribuire"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"
@@ -386,7 +364,7 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
 #    join_desc_4: "and we'll go from there!"
 #    join_url_email: "Email us"
 #    join_url_hipchat: "public HipChat room"
-#    more_about_archmage: "Learn More About Becoming A Powerful Archmage"
+    more_about_archmage: "Leggi di più su cosa vuol dire diventare un potente Arcimago"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
 #    artisan_introduction_suf: "to then this class might be for you."
@@ -398,7 +376,7 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
 #    artisan_join_step2: "Create a new level and explore existing levels."
 #    artisan_join_step3: "Find us in our public HipChat room for help."
 #    artisan_join_step4: "Post your levels on the forum for feedback."
-#    more_about_artisan: "Learn More About Becoming A Creative Artisan"
+    more_about_artisan: "Leggi di più su cosa vuol dire diventare un creativo Artigiano"
 #    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
 #    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
 #    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
@@ -406,58 +384,58 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
 #    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
 #    adventurer_forum_url: "our forum"
 #    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    more_about_adventurer: "Learn More About Becoming A Brave Adventurer"
+    more_about_adventurer: "Leggi di più su cosa vuol dire diventare un coraggioso Avventuriero"
 #    adventurer_subscribe_desc: "Get emails when there are new levels to test."
 #    scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
-#    scribe_introduction_url_mozilla: "Mozilla Developer Network"
+    scribe_introduction_url_mozilla: "Rete di sviluppo di Mozilla"
 #    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"
 #    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 Diligent Scribe"
+    more_about_scribe: "Leggi di più su cosa vuol dire diventare un diligente Scrivano"
 #    scribe_subscribe_desc: "Get emails about article writing announcements."
-#    diplomat_introduction_pref: "So, if there's one thing we learned from the "
-#    diplomat_launch_url: "launch in October"
-#    diplomat_introduction_suf: "it's that there is sizeable interest in CodeCombat in other countries, particularly Brazil! We're building a corps of translators eager to turn one set of words into another set of words to get CodeCombat as accessible across the world as possible. If you like getting sneak peeks at upcoming content and getting these levels to your fellow nationals ASAP, then this class might be for you."
-#    diplomat_attribute_1: "Fluency in English and the language you would like to translate to. When conveying complicated ideas, it's important to have a strong grasp in both!"
-#    diplomat_join_pref: "We've started a lot of initial translations at "
-#    diplomat_doc_url: "this forum post"
-#    diplomat_join_suf: "so check it out and add things for your language. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    more_about_diplomat: "Learn More About Becoming A Great Diplomat"
-#    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
-#    ambassador_introduction: "This is a community we're building, and you are the connections. We've got Olark chats, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
+    diplomat_introduction_pref: "Se c'è una cosa che abbiamo imparato dal "
+    diplomat_launch_url: "lancio di ottobre"
+    diplomat_introduction_suf: "è che c'è un notevole interesse per CodeCombat negli altri paesi, in particolare in Brasile! Stiamo costruendo un corpo di traduttori per trasformare liste di parole in altre parole, per rendere CodeCombat accessibile il più possibile in tutto il mondo. Se ti piace l'idea di sbirciare nei contenuti futuri e di portare questi livelli ai tuoi connazionali il più presto possibile, questa categoria potrebbe essere la tua."
+    diplomat_attribute_1: "Competenza in inglese e nella lingua in cui vorresti tradurre. Per trasferire idee complesse è importante avere una solida capacità in entrambe!"
+    diplomat_join_pref: "Abbiamo avviato molte traduzioni in "
+    diplomat_doc_url: "questo post del forum:"
+    diplomat_join_suf: "leggilo e aggiungi dettagli per la tua lingua. Segna anche la casella qui sotto per seguire gli aggiornamenti sullo sviluppo i18n!"
+    more_about_diplomat: "Leggi di più su cosa vuol dire diventare un grande Diplomatico"
+    diplomat_subscribe_desc: "Ricevi messaggi email sullo sviluppo i18n e i livelli da tradurre."
+    ambassador_introduction: "Stiamo costruendo questa comunità, e voi siete i collegamenti. Abbiamo chat Olark, email e reti sociali con tanta gente con cui parlare ed aiutare a familiarizzare con il gioco, e da cui imparare. Se vuoi aiutare le persone a farsi coinvolgere e a divertirsi; se sei entrato nello spirito di CodeCombat e di dove stiamo andando, questa categoria può essere per te."
 #    ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
 #    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
 #    ambassador_join_note_strong: "Note"
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-#    more_about_ambassador: "Learn More About Becoming A Helpful Ambassador"
+    more_about_ambassador: "Leggi di più su cosa vuol dire diventare un servizievole Ambasciatore"
 #    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
 #    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
 #    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
 #    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
 #    counselor_attribute_2: "A little bit of free time!"
 #    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming A Valuable 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:"
+    more_about_counselor: "Leggi di più su cosa vuol dire diventare un valido Consigliere"
+    changes_auto_save: "Le modifiche vengono salvate automaticamente quando si segnano le caselle."
+    diligent_scribes: "I nostri diligenti scrivani:"
+    powerful_archmages: "I nostri potenti arcimaghi:"
+    creative_artisans: "I nostri creativi artigiani:"
+    brave_adventurers: "I nostri coraggiosi avventurieri:"
+    translating_diplomats: "I nostri poliglotti diplomatici:"
+    helpful_ambassadors: "I nostri servizievoli ambasciatori:"
 
-#  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: "Arcimago"
+    archmage_title_description: "(Programmazione)"
+    artisan_title: "Artigiano"
+    artisan_title_description: "(Costruzione livelli)"
+    adventurer_title: "Avventuriero"
+    adventurer_title_description: "(Prova di gioco dei livelli)"
+    scribe_title: "Scriba"
+    scribe_title_description: "(Scrittura articoli)"
+    diplomat_title: "Diplomatico"
+    diplomat_title_description: "(Traduzione)"
+    ambassador_title: "Ambasciatore"
+    ambassador_title_description: "(Supporto)"
+    counselor_title: "Consigliere"
+    counselor_title_description: "(Esperto/Insegnante)"

app/locale/ja.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     loading: "ロード中"
     saving: "保存中..."
     sending: "送信中..."
+    cancel: "キャンセル"
+    save: "保存"
+    delay_1_sec: "1秒"
+    delay_3_sec: "3秒"
+    delay_5_sec: "5秒"
+    manual: "手動"
+#    fork: "Fork"
+    play: "ゲームスタート"
 
   modal:
     close: "閉じる"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     page_not_found: "ページが見つかりません"
 
   nav:
-    sign_up: "アカウント登録"
-    log_in: "ログイン"
-    log_out: "ログアウト"
     play: "ゲームスタート"
     editor: "レベルエディタ"
     blog: "ブログ"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     twitter_follow: "フォロー"
 #    employers: "Employers"
 
-  forms:
-    name: "名前"
-    email: "メールアドレス"
-    message: "メッセージ"
-    cancel: "キャンセル"
-    save: "保存"
-
   versions:
     save_version_title: "新しいバージョンを保存"
-    commit_message: "コミットメッセージ"
     new_major_version: "メジャーバージョンを新しくする"
     cla_prefix: "変更を適用するには, 私達のCLAに同意する必要があります。"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     cla_agree: "同意する"
 
   login:
-    login_modal_title: "ログイン"
-    log_in: "ログイン"
     sign_up: "アカウント登録"
-    or: "または"
+    log_in: "ログイン"
+    log_out: "ログアウト"
     recover: "パスワードを忘れた場合はこちら"
 
   recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     coppa_why: "(COPPAって?)"
     creating: "アカウントを作成しています..."
     sign_up: "アカウント登録"
-    or: "または"
     log_in: "パスワードでログイン"
 
   home:
@@ -79,13 +74,13 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     adventurer_suffix: ""
     campaign_beginner: "初心者のキャンペーン"
 #    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
+    campaign_dev: "いろんな難しいレベル"
 #    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
+    campaign_multiplayer: "マルチプレイ・アリーナ"
 #    campaign_multiplayer_description: "... in which you code head-to-head against other players."
 #    campaign_player_created: "Player-Created"
 #    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
+    level_difficulty: "難易度: "
 
   contact:
     contact_us: "お問い合わせ"
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     forum_prefix: "公開で様々な人と議論したい場合は "
     forum_page: "こちらのフォーラム"
     forum_suffix: " でお願いします。"
-    sending: "送信中"
     send: "フィードバックを送信"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     new_password_verify: "新パスワードを再入力"
     email_subscriptions: "ニュースレターの購読"
     email_announcements: "お知らせ"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "CodeCombatの最新のニュースや進展をメールで受け取る"
     contributor_emails: "開発を手伝ってくれる人向けのメール"
     contribute_prefix: "私達は開発を手伝ってくれる人を探しています。 詳しくは "
     contribute_page: "こちらのページ"
     contribute_suffix: " を確認して下さい。"
     email_toggle: "すべて"
-    saving: "セーブ中"
     error_saving: "セーブ中にエラーが発生しました"
     saved: "変更しました"
     password_mismatch: "パスワードが違います"
@@ -189,18 +183,15 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     tome_minion_spells: "操作できるキャラクターの呪文"
     tome_read_only_spells: "読込専用の呪文"
     tome_other_units: "その他のユニット"
-#    tome_cast_button_castable: "Cast"
-#    tome_cast_button_casting: "Casting"
-#    tome_cast_button_cast: "Spell Cast"
+    tome_cast_button_castable: "キャスト"
+    tome_cast_button_casting: "キャスト中"
+    tome_cast_button_cast: "呪文をキャスト"
     tome_autocast_delay: "自動実行待機時間"
-    tome_autocast_1: "1秒"
-    tome_autocast_3: "3秒"
-    tome_autocast_5: "5秒"
-    tome_autocast_manual: "手動"
     tome_select_spell: "呪文を選択"
 #    tome_select_a_thang: "Select Someone for "
     tome_available_spells: "利用できる呪文"
     hud_continue: "続く　（Shift+Spaceキー）"
+#    spell_saved: "Spell Saved"
 
   admin:
     av_title: "管理画面"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+    or: "または"
+    name: "名前"
+#    body: "Body"
+#    version: "Version"
+    commit_msg: "コミットメッセージ"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "メールアドレス"
+    message: "メッセージ"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/ko.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/lt.coffee

@@ -1,8 +1,16 @@
-module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lithuanian", translation:
+module.exports = nativeDescription: "English (AU)", englishDescription: "English (AU)", translation:
   common:
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/ms-BA.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa Malaysia", translation:
-#  common:
+  common:
 #    loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+    cancel: "Batal"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+    play: "bermain"
 
   modal:
     close: "Tutup"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     page_not_found: "Halaman tidak ditemui"
 
   nav:
-    sign_up: "Buat Akaun"
-    log_in: "Log Masuk"
-    log_out: "Log Keluar"
     play: "bermain"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-  forms:
-    name: "Nama"
-    email: "Emel"
-    message: "Mesej"
-    cancel: "Batal"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Buat Akaun"
     log_in: "Log Masuk"
-    sign_up: "buat akaun baru"
-    or: ", atau "
+    log_out: "Log Keluar"
     recover: "perbaharui akaun"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     coppa_why: "(Kenapa?)"
     creating: "Membuat Akaun..."
     sign_up: "Daftar"
-    or: "atau "
     log_in: "log masuk"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
 #  diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "atau"
+    name: "Nama"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Emel"
+    message: "Mesej"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/nb.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     loading: "Laster..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+    cancel: "Avbryt"
+#    save: "Save"
+    delay_1_sec: "1 sekunder"
+    delay_3_sec: "3 sekunder"
+    delay_5_sec: "5 sekunder"
+    manual: "Manuelt"
+#    fork: "Fork"
+    play: "Spill"
 
   modal:
     close: "Lukk"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     page_not_found: "Finner ikke siden"
 
   nav:
-    sign_up: "Lag konto"
-    log_in: "Logg Inn"
-    log_out: "Logg Ut"
     play: "Spill"
     editor: "Editor"
     blog: "Blogg"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     twitter_follow: "Følg"
 #    employers: "Employers"
 
-  forms:
-    name: "Navn"
-    email: "Epost"
-    message: "Melding"
-    cancel: "Avbryt"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Lag konto"
     log_in: "Logg Inn"
-    sign_up: "lag ny konto"
-    or: ", eller "
+    log_out: "Logg Ut"
     recover: "gjenåpne konto"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     coppa_why: "(Hvorfor?)"
     creating: "Oppretter Konto..."
     sign_up: "Registrer deg"
-    or: "eller "
     log_in: "logg inn med passord"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     forum_prefix: "For allment tilgjengelige henvendelser, vennligst prøv "
     forum_page: "forumet vårt"
     forum_suffix: " i steden."
-    sending: "Sender..."
     send: "Send Tilbakemelding"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     new_password_verify: "Verifiser"
     email_subscriptions: "Epost Abonnement"
     email_announcements: "Kunngjøringer"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Få epost om siste nytt og utvikling fra CodeCombat."
     contributor_emails: "Contributor Klasse Epost"
     contribute_prefix: "Vi leter etter folk som vil delta på festen vår! Sjekk ut "
     contribute_page: "bidra siden"
     contribute_suffix: " for å finne ut mer."
     email_toggle: "Vis Alle"
-    saving: "Lagrer..."
     error_saving: "Lagring Feilet"
     saved: "Endringer Lagret"
     password_mismatch: "Passordene er ikke like."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     tome_cast_button_casting: "Kaster"
     tome_cast_button_cast: "Kast Trylleformular"
     tome_autocast_delay: "Automatisk Forsinkelse"
-    tome_autocast_1: "1 sekunder"
-    tome_autocast_3: "3 sekunder"
-    tome_autocast_5: "5 sekunder"
-    tome_autocast_manual: "Manuelt"
     tome_select_spell: "Velg et Trylleformular"
     tome_select_a_thang: "Velg Noe for å "
     tome_available_spells: "Tilgjenglige Trylleformularer"
     hud_continue: "Fortsett (trykk shift-mellomrom)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "eller"
+    name: "Navn"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Epost"
+    message: "Melding"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/nl.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     loading: "Aan het laden..."
     saving: "Opslaan..."
     sending: "Verzenden..."
+    cancel: "Annuleren"
+    save: "Opslagen"
+    fork: "Fork"
+    play: "Spelen"
+    delay_1_sec: "1 seconde"
+    delay_3_sec: "3 secondes"
+    delay_5_sec: "5 secondes"
+    manual: "Handboek"
 
   modal:
     close: "Sluiten"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     page_not_found: "Pagina niet gevonden"
 
   nav:
-    sign_up: "Account Maken"
-    log_in: "Inloggen"
-    log_out: "Uitloggen"
     play: "Spelen"
     editor: "Editor"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     twitter_follow: "Volgen"
     employers: "Werknemers"
 
-  forms:
-    name: "Naam"
-    email: "Email"
-    message: "Bericht"
-    cancel: "Annuleren"
-    save: "Opslagen"
-
   versions:
     save_version_title: "Nieuwe versie opslagen"
-    commit_message: "Commit Bericht"
     new_major_version: "Nieuwe hoofd versie"
     cla_prefix: "Om bewerkingen op te slagen, moet je eerst akkoord gaan met onze"
     cla_url: "CLA"
@@ -45,14 +42,13 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     cla_agree: "IK GA AKKOORD"
 
   login:
-    login_modal_title: "Log In"
     log_in: "Inloggen"
-    sign_up: "nieuw account aanmaken"
-    or: ", of "
+    log_out: "Uitloggen"
+    sign_up: "Account Maken"
     recover: "account herstellen"
 
   recover:
-    recover_account_title: "Herkrijg Account"
+    recover_account_title: "Herstel Account"
     send_password: "Verzend nieuw wachtwoord"
 
   signup:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     coppa_why: "(Waarom?)"
     creating: "Account aanmaken..."
     sign_up: "Aanmelden"
-    or: "of "
     log_in: "inloggen met wachtwoord"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     forum_prefix: "Voor iets publiekelijks, probeer dan "
     forum_page: "ons forum"
     forum_suffix: "."
-    sending: "Verzenden..."
     send: "Feedback Verzonden"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     new_password_verify: "Verifieer"
     email_subscriptions: "Email Abonnementen"
     email_announcements: "Aankondegingen"
+    email_notifications_description: "Krijg periodieke meldingen voor jouw account."
     email_announcements_description: "Verkrijg emails over het laatste nieuws en de ontwikkelingen bij CodeCombat."
     contributor_emails: "Medewerker Klasse emails"
     contribute_prefix: "We zoeken mensen om bij ons feest aan te voegen! Bekijk de "
     contribute_page: "contributie pagina"
     contribute_suffix: " om meer te weten te komen."
     email_toggle: "Vink alles aan/af"
-    saving: "Opslaan..."
     error_saving: "Fout Tijdens Het Opslaan"
     saved: "Aanpassingen Opgeslagen"
     password_mismatch: "Het wachtwoord komt niet overeen."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     tome_cast_button_casting: "Aan het uitvoeren"
     tome_cast_button_cast: "Spreuk uitvoeren"
     tome_autocast_delay: "Spreuk Uitvoeren vertraging"
-    tome_autocast_1: "1 seconde"
-    tome_autocast_3: "3 seconde"
-    tome_autocast_5: "5 seconde"
-    tome_autocast_manual: "Handmatig"
     tome_select_spell: "Selecteer een Spreuk"
     tome_select_a_thang: "Selecteer Iemand voor "
     tome_available_spells: "Beschikbare spreuken"
     hud_continue: "Ga verder (druk shift-space)"
+    spell_saved: "Spreuk Opgeslagen"
 
   admin:
     av_title: "Administrator panels"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     contact_us: "contacteer ons!"
     hipchat_prefix: "Je kan ons ook vinden in ons"
     hipchat_url: "(Engelstalig) HipChat kanaal."
-    level_btn_save: "Opslaan"
-    level_btn_fork: "Fork"
-    level_btn_play: "Spelen"
     level_some_options: "Enkele opties?"
-    level_options_1_second: "1 seconde"
-    level_options_3_seconds: "3 secondes"
-    level_options_5_seconds: "5 secondes"
-    level_options_manual: "Handboek"
     level_tab_thangs: "Elementen"
     level_tab_scripts: "Scripts"
     level_tab_settings: "Instellingen"
@@ -252,18 +236,11 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     level_component_edit_title: "Wijzig Component"
     level_system_edit_title: "Wijzig Systeem"
     create_system_title: "Maak een nieuw Systeem aan"
-    create_system_field_name: "Naam"
-    create_system_btn_cancel: "Annuleren"
-    create_system_btn_create: "Aanmaken"
     new_component_title: "Maak een nieuw Component aan"
     new_component_field_system: "Systeem"
-    new_component_field_name: "naam"
-    new_component_btn_cancel: "Annuleren"
-    new_component_btn_create: "Aanmaken"
 
   article:
     edit_btn_preview: "Voorbeeld"
-    edit_btn_save: "Opslaan"
     edit_article_title: "Wijzig Artikel"
 
   general:
@@ -272,7 +249,12 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     name: "Naam"
     description: "Beschrijving"
     version: "Versie"
+    commit_msg: "Commit Bericht"
+    version_history_for: "Versie geschiedenis voor: "
     body: "Inhoud"
+    or: "of"
+    email: "Email"
+    message: "Bericht"
 
   about:
     who_is_codecombat: "Wie is CodeCombat?"
@@ -383,19 +365,19 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     join_url_email: "E-mail ons"
     join_url_hipchat: "ons publiek (Engelstalig) HipChat kanaal"
     more_about_archmage: "Leer meer over hoe je een Machtige Tovenaar kan worden"
-    archmage_subscribe_desc: "Ontvang e-mails en nieuwe codeer oppurtiniteiten en aankondigingen."
+    archmage_subscribe_desc: "Ontvang e-mails met nieuwe codeer oppurtiniteiten en aankondigingen."
     artisan_introduction_pref: "We moeten meer levels bouwen! Mensen schreeuwen om meer inhoud, en er zijn ook maar zoveel levels dat wij kunnen maken. Momenteel is jouw werkplaats level een; onze level editor is amper gebruikt door zelfs ons, wees dus voorzichtig. Indien je visioenen hebt van campagnes, gaande van for-loops tot"
     artisan_introduction_suf: "dan is deze klasse waarschijnlijk iets voor jou."
-    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
-    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
-    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
-    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
-    artisan_join_step1: "Read the documentation."
-    artisan_join_step2: "Create a new level and explore existing levels."
-    artisan_join_step3: "Find us in our public HipChat room for help."
-    artisan_join_step4: "Post your levels on the forum for feedback."
-    more_about_artisan: "Learn More About Becoming A Creative Artisan"
-    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
+    artisan_attribute_1: "Enige ervaring in het maken van gelijkbare inhoud. Bijvoorbeeld ervaring het gebruiken van Blizzard's level editor. Maar dit is niet vereist!"
+    artisan_attribute_2: "Tot in detail testen en itereren staat voor jou gelijk aan plezier. Om goede levels te maken, moet jet het door anderen laten spelen en bereid zijn om een hele boel aan te passen."
+    artisan_attribute_3: "Momenteel heb je nog veel geduld nodig, doordat onze editor nog vrij ruw is en op je frustraties kan werken. Samenwerken met een Adventurer kan jou ook veel helpen."
+    artisan_join_desc: "Gebruik de Level Editor in deze volgorde, min of meer:"
+    artisan_join_step1: "Lees de documentatie."
+    artisan_join_step2: "Maak een nieuw level en bestudeer reeds bestaande levels."
+    artisan_join_step3: "Praat met ons in ons publieke (Engelstalige) HipChat kanaal voor hulp. (optioneel)"
+    artisan_join_step4: "Maak een bericht over jou level op ons forum voor feedback."
+    more_about_artisan: "Leer meer over hoe je een Creatieve Ambachtsman kan worden."
+    artisan_subscribe_desc: "Ontvang e-mails met nieuws over de Level Editor."
     adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
     adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
     adventurer_attribute_2: "Charismatic. Be gentle but articulate about what needs improving, and offer suggestions on how to improve."

app/locale/nn.coffee

@@ -1,8 +1,16 @@
-module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "Norwegian Nynorsk", translation:
+module.exports = nativeDescription: "English (AU)", englishDescription: "English (AU)", translation:
   common:
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,13 +91,12 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
 #    title: "Help translate CodeCombat!"
 #    sub_heading: "We need your language skills."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Norwegian Nynorsk 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 Norwegian Nynorsk."
+    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in {English} 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 Norwegian Nynorsk."
     missing_translations: "Until we can translate everything into Norwegian Nynorsk, you'll see English when Norwegian Nynorsk isn't available."
 #    learn_more: "Learn more about being a Diplomat"
 #    subscribe_as_diplomat: "Subscribe as a Diplomat"
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Norwegian (Nynorsk)", englishDescription: "
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/no.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     loading: "Laster..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+    cancel: "Avbryt"
+#    save: "Save"
+    delay_1_sec: "1 sekunder"
+    delay_3_sec: "3 sekunder"
+    delay_5_sec: "5 sekunder"
+    manual: "Manuelt"
+#    fork: "Fork"
+    play: "Spill"
 
   modal:
     close: "Lukk"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     page_not_found: "Finner ikke siden"
 
   nav:
-    sign_up: "Lag konto"
-    log_in: "Logg Inn"
-    log_out: "Logg Ut"
     play: "Spill"
     editor: "Editor"
     blog: "Blogg"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     twitter_follow: "Følg"
 #    employers: "Employers"
 
-  forms:
-    name: "Navn"
-    email: "Epost"
-    message: "Melding"
-    cancel: "Avbryt"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Lag konto"
     log_in: "Logg Inn"
-    sign_up: "lag ny konto"
-    or: ", eller "
+    log_out: "Logg Ut"
     recover: "gjenåpne konto"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     coppa_why: "(Hvorfor?)"
     creating: "Oppretter Konto..."
     sign_up: "Registrer deg"
-    or: "eller "
     log_in: "logg inn med passord"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     forum_prefix: "For allment tilgjengelige henvendelser, vennligst prøv "
     forum_page: "forumet vårt"
     forum_suffix: " i steden."
-    sending: "Sender..."
     send: "Send Tilbakemelding"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     new_password_verify: "Verifiser"
     email_subscriptions: "Epost Abonnement"
     email_announcements: "Kunngjøringer"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Få epost om siste nytt og utvikling fra CodeCombat."
     contributor_emails: "Contributor Klasse Epost"
     contribute_prefix: "Vi leter etter folk som vil delta på festen vår! Sjekk ut "
     contribute_page: "bidra siden"
     contribute_suffix: " for å finne ut mer."
     email_toggle: "Vis Alle"
-    saving: "Lagrer..."
     error_saving: "Lagring Feilet"
     saved: "Endringer Lagret"
     password_mismatch: "Passordene er ikke like."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     tome_cast_button_casting: "Kaster"
     tome_cast_button_cast: "Kast Trylleformular"
     tome_autocast_delay: "Automatisk Forsinkelse"
-    tome_autocast_1: "1 sekunder"
-    tome_autocast_3: "3 sekunder"
-    tome_autocast_5: "5 sekunder"
-    tome_autocast_manual: "Manuelt"
     tome_select_spell: "Velg et Trylleformular"
     tome_select_a_thang: "Velg Noe for å "
     tome_available_spells: "Tilgjenglige Trylleformularer"
     hud_continue: "Fortsett (trykk shift-mellomrom)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "eller"
+    name: "Navn"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Epost"
+    message: "Melding"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/pl.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "język polski", englishDescription: "Polish", translation:
   common:
     loading: "Ładowanie..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Zapisuję..."
+    sending: "Wysyłanie…"
+    cancel: "Anuluj"
+#    save: "Save"
+    delay_1_sec: "1 sekunda"
+    delay_3_sec: "3 sekunda"
+    delay_5_sec: "5 sekunda"
+    manual: "Ręcznie"
+#    fork: "Fork"
+    play: "Graj"
 
   modal:
     close: "Zamknij"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     page_not_found: "Strona nie istnieje"
 
   nav:
-    sign_up: "Stwórz Konto"
-    log_in: "Zaloguj się"
-    log_out: "Wyloguj się"
     play: "Graj"
     editor: "Edytor"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     twitter_follow: "Podążaj"
 #    employers: "Employers"
 
-  forms:
-    name: "Imie"
-    email: "Email"
-    message: "Wiadomość"
-    cancel: "Anuluj"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,14 +42,13 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "Zaloguj się "
-    sign_up: "stwórz nowe konto"
-    or: ", lub "
+    sign_up: "Stwórz Konto"
+    log_in: "Zaloguj się"
+    log_out: "Wyloguj się"
     recover: "odzyskaj konto"
 
-#  recover:
-#    recover_account_title: "Recover Account"
+  recover:
+    recover_account_title: "odzyskaj konto"
 #    send_password: "Send Recovery Password"
 
   signup:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     coppa_why: "(Dlaczego?)"
     creating: "Tworzenie konta"
     sign_up: "Zarejestruj"
-    or: "lub "
     log_in: "zaloguj się używając hasła"
 
   home:
@@ -79,128 +74,124 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     adventurer_suffix: "."
     campaign_beginner: "Kampania dla początkujących"
     campaign_beginner_description: "... W której nauczysz się magii programowania"
-#    campaign_dev: "Random Harder Levels"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
-#    campaign_player_created: "Player-Created"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
+    campaign_dev: "Losowe Trudniejsze Poziomy"
+    campaign_dev_description: "... w których nauczysz się interfejsu robiąc coś trudniejszego."
+    campaign_multiplayer: "Pola Walki Dla Wielu Graczy"
+    campaign_multiplayer_description: "W których ścierasz się  z innymi graczami. "
+    campaign_player_created: "Stworzone Przez Graczy"
+    campaign_player_created_description: "... w których walczysz przeciwko dziełom <a href=\"/contribute#artisan\">Czarodziejów Rękodzielnictwa</a>"
+    level_difficulty: "Poziom trudności: "
 
-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
-#    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
-#    forum_suffix: " instead."
-#    sending: "Sending..."
-#    send: "Send Feedback"
+  contact:
+    contact_us: "Kontakt z CodeCombat"
+    welcome: "Miło Cię widzieć! Użyj tego formularza żeby wysłać do nas wiadomość. "
+    contribute_prefix: "Jeśli jesteś zainteresowany wsparciem projektu, zapoznaj się z naszą"
+    contribute_page: "stroną współpracy"
+    contribute_suffix: "!"
+    forum_prefix: "W sprawach ogólnych skorzystaj z"
+    forum_page: "naszego forum"
+    forum_suffix: "."
+    send: "Wyślij Wiadomość"
 
-#  diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
-#    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in {English} 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 {English}."
-#    missing_translations: "Until we can translate everything into {English}, you'll see English when {English} isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+  diplomat_suggestion:
+    title: "Pomóż w tłumaczeniu CodeCombat!"
+    sub_heading: "Potrzebujemy twoich zdolności językowych."
+    pitch_body: "Tworzymy CodeCombat w języku angielskim, Jadnak nasi gracze pochodzą z całego świata. Wielu z nich chciałoby zagrać zagrać w swoim języku, ponieważ nie znają angielskiego, więc jeśli znasz oba języki zostań Dyplomatą i pomóż w tłumaczeniu strony CodeCombat, i gry."
+    missing_translations: "Dopóki nie przetłumaczymy wszystkiego na polski, będziesz widział niektóre napisy w języku angielskim."
+    learn_more: "Dowiedz się więcej o Dyplomatach."
+    subscribe_as_diplomat: "Dołącz do dyplomatów"
 
 #  wizard_settings:
 #    title: "Wizard Settings"
 #    customize_avatar: "Customize Your Avatar"
 
-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
-#    me_tab: "Me"
-#    picture_tab: "Picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
-#    gravatar_select: "Select which Gravatar photo to use"
-#    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
-#    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
-#    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
-#    contributor_emails: "Contributor Class Emails"
-#    contribute_prefix: "We're looking for people to join our party! Check out the "
-#    contribute_page: "contribute page"
-#    contribute_suffix: " to find out more."
-#    email_toggle: "Toggle All"
-#    saving: "Saving..."
-#    error_saving: "Error Saving"
-#    saved: "Changes Saved"
-#    password_mismatch: "Password does not match."
+  account_settings:
+    title: "Ustawienia Konta"
+    not_logged_in: "Zaloguj się lub stwórz konto by dostosować ustawienia."
+    autosave: "Zmiany zapisują się automatycznie"
+    me_tab: "Ja"
+    picture_tab: "Zdjęcie"
+    wizard_tab: "Czarodziej"
+    password_tab: "Hasło"
+    emails_tab: "Powiadomienia"
+    gravatar_select: "Wybierz fotografię z Gravatar"
+    gravatar_add_photos: "Dodaj zdjęcia i miniatury do swojego konta Gravatar by móc wybrać zdjęcie."
+    gravatar_add_more_photos: "Dodaj więcej zdjęć do swojego konta Gravatar, by móc je użyć tutaj."
+    wizard_color: "Kolor ubrań czarodzieja"
+    new_password: "Nowe hasło"
+    new_password_verify: "Zweryfikuj"
+    email_subscriptions: "Powiadomienia email"
+    email_announcements: "Ogłoszenia"
+#    email_notifications_description: "Get periodic notifications for your account."
+    email_announcements_description: "Otrzymuj powiadomienia o najnowszych wiadomościach i zmianach w CodeCombat."
+    contributor_emails: "Powiadomienia asystentów"
+    contribute_prefix: "Szukamy osób, które chciałyby do nas dołączyć! Sprawdź"
+    contribute_page: "stronę asystentów"
+    contribute_suffix: "aby dowiedzieć się więcej."
+    email_toggle: "Zmień wszystkie"
+    error_saving: "Błąd zapisywania"
+    saved: "Zmiany zapisane"
+    password_mismatch: "Nieprawidłowe hasło"
 
-#  account_profile:
-#    edit_settings: "Edit Settings"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    profile: "Profile"
-#    user_not_found: "No user found. Check the URL?"
-#    gravatar_not_found_mine: "We couldn't find your profile associated with:"
-#    gravatar_not_found_email_suffix: "."
-#    gravatar_signup_prefix: "Sign up at "
-#    gravatar_signup_suffix: " to get set up!"
-#    gravatar_not_found_other: "Alas, there's no profile associated with this person's email address."
-#    gravatar_contact: "Contact"
-#    gravatar_websites: "Websites"
+  account_profile:
+    edit_settings: "Edytuj Ustawienia"
+    profile_for_prefix: "Profil"
+    profile_for_suffix: ""
+    profile: "Profil"
+    user_not_found: "Nieznaleziono użytkownika. Sprawdź odnośnik URL?"
+    gravatar_not_found_mine: "Nie udało nam się znaleźć profilu powiązanego z:"
+    gravatar_not_found_email_suffix: "."
+    gravatar_signup_prefix: "Utwórz konto w"
+    gravatar_signup_suffix: "aby rozpocząć!"
+    gravatar_not_found_other: "Niestety nie ma profilu powiązanego z tym adresem email."
+    gravatar_contact: "Kontakt"
+    gravatar_websites: "Strony WWW"
 #    gravatar_accounts: "As Seen On"
-#    gravatar_profile_link: "Full Gravatar Profile"
+    gravatar_profile_link: "Profil Gravatar"
 
-#  play_level:
-#    level_load_error: "Level could not be loaded."
-#    done: "Done"
-#    grid: "Grid"
-#    customize_wizard: "Customize Wizard"
-#    home: "Home"
-#    guide: "Guide"
-#    multiplayer: "Multiplayer"
-#    restart: "Restart"
-#    goals: "Goals"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
-#    reload_title: "Reload All Code?"
-#    reload_really: "Are you sure you want to reload this level back to the beginning?"
-#    reload_confirm: "Reload All"
-#    victory_title_prefix: ""
-#    victory_title_suffix: " Complete"
-#    victory_sign_up: "Sign Up to Save Progress"
-#    victory_sign_up_poke: "Want to save your code? Create a free account!"
-#    victory_rate_the_level: "Rate the level: "
-#    victory_play_next_level: "Play Next Level"
-#    victory_go_home: "Go Home"
-#    victory_review: "Tell us more!"
-#    victory_hour_of_code_done: "Are You Done?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code!"
-#    multiplayer_title: "Multiplayer Settings"
-#    multiplayer_link_description: "Give this link to anyone to have them join you."
-#    multiplayer_hint_label: "Hint:"
-#    multiplayer_hint: " Click the link to select all, then press ⌘-C or Ctrl-C to copy the link."
-#    multiplayer_coming_soon: "More multiplayer features to come!"
-#    guide_title: "Guide"
-#    tome_minion_spells: "Your Minions' Spells"
-#    tome_read_only_spells: "Read-Only Spells"
-#    tome_other_units: "Other Units"
-#    tome_cast_button_castable: "Cast"
-#    tome_cast_button_casting: "Casting"
-#    tome_cast_button_cast: "Spell Cast"
-#    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
-#    tome_select_spell: "Select a Spell"
-#    tome_select_a_thang: "Select Someone for "
-#    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+  play_level:
+    level_load_error: "Nie udało się wczytać poziomu."
+    done: "Zrobione"
+    grid: "Siatka"
+    customize_wizard: "Spersonalizuj Czarodzieja"
+    home: "Strona główna"
+    guide: "Przewodnik"
+    multiplayer: "Multiplayer"
+    restart: "Zacznij od nowa"
+    goals: "Cele"
+    action_timeline: "Oś czasu"
+    click_to_select: "Kliknij jednostkę by ją zaznaczyć"
+    reload_title: "Przywrócić cały kod?"
+    reload_really: "Czy jesteś pewien, że chcesz przywrócić kod startowy tego poziomu?"
+    reload_confirm: "Przywróć cały kod"
+    victory_title_prefix: ""
+    victory_title_suffix: " Zakończony"
+    victory_sign_up: "Zapisz się by otrzymywać akutalności"
+    victory_sign_up_poke: "Chcesz otrzymywać najnowsze wiadomości na email? Załóź darmowe konto i będziemy w kontakcie."
+    victory_rate_the_level: "Oceń poziom"
+    victory_play_next_level: "Zagraj w następny poziom"
+    victory_go_home: "Powrót do strony głównej"
+    victory_review: "Powiedz nam coś więcej!"
+    victory_hour_of_code_done: "Skończyłeś już?"
+    victory_hour_of_code_done_yes: "Tak, skończyłem moją Godzinę Kodowania."
+    multiplayer_title: "Ustawienia Multiplayer"
+    multiplayer_link_description: "Przekaż ten link, jeśli chcesz by ktoś do Ciebie dołączył"
+    multiplayer_hint_label: "Podpowiedź:"
+    multiplayer_hint: "Klikjnij link by zaznaczyć wszystko, potem wciśnij Cmd-C lub Ctrl-C by skopiować ten link."
+    multiplayer_coming_soon: "Wkrótce więcej opcji Multiplayer"
+    guide_title: "Przewodnik"
+    tome_minion_spells: "Czary Twojego podopiecznego"
+    tome_read_only_spells: "Czary tylko do odczytu"
+    tome_other_units: "Inne jednostki"
+    tome_cast_button_castable: "Rzuć czar"
+    tome_cast_button_casting: "Rzucam czar"
+    tome_cast_button_cast: "Rzucenie czaru"
+    tome_autocast_delay: "Opóźnienie automatycznego rzucania czaru"
+    tome_select_spell: "Wybierz Czar"
+    tome_select_a_thang: "Wybierz kogoś do"
+    tome_available_spells: "Dostępne czary"
+    hud_continue: "Kontynuuj (naciśnij enter)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "lub"
+    name: "Imie"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Email"
+    message: "Wiadomość"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/pt-BR.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     loading: "Carregando..."
     saving: "Salvando..."
     sending: "Enviando..."
+    cancel: "Cancelar"
+    save: "Salvar"
+    delay_1_sec: "1 segundo"
+    delay_3_sec: "3 segundos"
+    delay_5_sec: "5 segundos"
+    manual: "Manual"
+#    fork: "Fork"
+    play: "Jogar"
 
   modal:
     close: "Fechar"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     page_not_found: "Página não encontrada"
 
   nav:
-    sign_up: "Criar conta"
-    log_in: "Entrar"
-    log_out: "Sair"
     play: "Jogar"
     editor: "Editor"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     twitter_follow: "Seguir"
 #    employers: "Employers"
 
-  forms:
-    name: "Nome"
-    email: "Email"
-    message: "Mensagem"
-    cancel: "Cancelar"
-    save: "Salvar"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    cla_agree: "I AGREE"
 
   login:
-    login_modal_title: "Entrar"
+    sign_up: "Criar conta"
     log_in: "Entrar"
-    sign_up: "Criar uma nova conta"
-    or: ", ou "
+    log_out: "Sair"
     recover: "recuperar sua conta"
 
   recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     coppa_why: "(Por quê?)"
     creating: "Criando a nova conta..."
     sign_up: "Criar conta"
-    or: "ou "
     log_in: "Entre com a senha"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     forum_prefix: "Para algo público, por favor acesse "
     forum_page: "nosso fórum"
     forum_suffix: " ao invés disso."
-    sending: "Enviando..."
     send: "Enviar opinião"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     new_password_verify: "Confirmação"
     email_subscriptions: "Assinaturas para Notícias por Email"
     email_announcements: "Notícias"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Receba emails com as últimas notícias e desenvolvimentos do CodeCombat."
     contributor_emails: "Emails para as Classes de Contribuidores"
     contribute_prefix: "Estamos procurando pessoas para se juntar à nossa turma! Confira a nossa "
     contribute_page: "página de contribuição"
     contribute_suffix: " para saber mais."
     email_toggle: "Ativar todos"
-    saving: "Salvando..."
     error_saving: "Erro no salvamento"
     saved: "Alterações Salvas"
     password_mismatch: "As senhas não estão iguais"
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     tome_cast_button_casting: "Conjurando"
     tome_cast_button_cast: "Feitiço"
     tome_autocast_delay: "Atraso na autoconjuração"
-    tome_autocast_1: "1 segundo"
-    tome_autocast_3: "3 segundos"
-    tome_autocast_5: "5 segundos"
-    tome_autocast_manual: "Manual"
     tome_select_spell: "Selecione um Feitiço"
     tome_select_a_thang: "Selecione alguém para "
     tome_available_spells: "Feitiços Disponíveis"
     hud_continue: "Continue (tecle Shift+Space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "ou"
+    name: "Nome"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Email"
+    message: "Mensagem"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/pt-PT.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "Português europeu", englishDescription: "Portuguese (Portugal)", translation:
   common:
     loading: "A carregar..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "A guardar..."
+    sending: "A enviar..."
+    cancel: "Cancelar"
+    save: "Save"
+    delay_1_sec: "1 segundo"
+    delay_3_sec: "3 segundos"
+    delay_5_sec: "5 segundos"
+    manual: "Manual"
+    fork: "Fork"
+    play: "Jogar"
 
   modal:
     close: "Fechar"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     page_not_found: "Página não encontrada"
 
   nav:
-    sign_up: "Criar conta"
-    log_in: "Iniciar sessão"
-    log_out: "Terminar sessão"
     play: "Jogar"
     editor: "Editor"
     blog: "Blog"
@@ -26,44 +31,34 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     about: "Sobre"
     contact: "Contacto"
     twitter_follow: "Seguir"
-#    employers: "Employers"
+    employers: "Patrões"
 
-  forms:
-    name: "Nome"
-    email: "E-mail"
-    message: "Mensagem"
-    cancel: "Cancelar"
-#    save: "Save"
-
-#  versions:
-#    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+  versions:
+    save_version_title: "Guardar Nova Versão"
+    new_major_version: "Nova Versão Principal"
+    cla_prefix: "Para guardar as alterações, precisas concordar com o nosso"
+    cla_url: "CLA"
+    cla_suffix: "."
+    cla_agree: "EU CONCORDO"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Criar conta"
     log_in: "Iniciar sessão"
-    sign_up: "criar nova conta"
-    or: ", ou "
+    log_out: "Sair"
     recover: "recuperar conta"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Recuperar conta"
+    send_password: "Recuperar password"
 
   signup:
-#    create_account_title: "Create Account to Save Progress"
+    create_account_title: "Cria uma conta para guardar o teu progresso."
     description: "É grátis. Só precisamos de umas coisas e fica tudo pronto:"
     email_announcements: "Receber anúncios por e-mail"
     coppa: "13+ ou não-EUA "
     coppa_why: "(Porquê?)"
     creating: "A criar conta..."
     sign_up: "Registar"
-    or: "ou "
     log_in: "iniciar sessão com palavra-passe"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     forum_prefix: "Para algo público, por favor, usa o "
     forum_page: "nosso fórum"
     forum_suffix: " como alternativa."
-    sending: "A enviar..."
     send: "Enviar Feedback"
 
   diplomat_suggestion:
@@ -107,9 +101,9 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     learn_more: "Sabe mais sobre ser um Diplomata"
     subscribe_as_diplomat: "Subscrever como Diplomata"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
+  wizard_settings:
+    title: "Definições do Wizard"
+    customize_avatar: "Altera o teu Avatar"
 
   account_settings:
     title: "Definições da Conta"
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     new_password_verify: "Verificar"
     email_subscriptions: "Subscrições de E-mail"
     email_announcements: "Anúncios"
+    email_notifications_description: "Recebe notificações periódicas sobre a tua conta."
     email_announcements_description: "Recebe e-mails sobre as últimas novidades e desenvolvimentos no CodeCombat."
     contributor_emails: "E-mails para Contribuintes"
     contribute_prefix: "Estamos à procura de pessoas para se juntarem a nós! Visita a "
     contribute_page: "página de contribuição"
     contribute_suffix: " para mais informação."
     email_toggle: "Alternar todos"
-    saving: "A guardar..."
     error_saving: "Erro ao guardar"
     saved: "Alterações guardadas"
     password_mismatch: "As palavras-passe não coincidem."
@@ -142,11 +136,11 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
   account_profile:
     edit_settings: "Editar Definições"
     profile_for_prefix: "Perfil de "
-#    profile_for_suffix: ""
+    profile_for_suffix: ""
     profile: "Perfil"
     user_not_found: "Nenhum utilizador encontrado. Verifica o URL?"
     gravatar_not_found_mine: "Não conseguimos encontrar o teu perfil associado com:"
-#    gravatar_not_found_email_suffix: "."
+    gravatar_not_found_email_suffix: "."
     gravatar_signup_prefix: "Regista-te no "
     gravatar_signup_suffix: " para começares!"
     gravatar_not_found_other: "Infelizmente, não existe nenhum perfil associado ao endereço de e-mail desta pessoa."
@@ -170,114 +164,97 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     reload_title: "Recarregar todo o código?"
     reload_really: "Tens a certeza que queres recarregar este nível de volta ao início?"
     reload_confirm: "Recarregar tudo"
-#    victory_title_prefix: ""
+    victory_title_prefix: ""
     victory_title_suffix: " Concluído"
-#    victory_sign_up: "Sign Up to Save Progress"
-#    victory_sign_up_poke: "Want to save your code? Create a free account!"
-#    victory_rate_the_level: "Rate the level: "
-#    victory_play_next_level: "Play Next Level"
-#    victory_go_home: "Go Home"
-#    victory_review: "Tell us more!"
-#    victory_hour_of_code_done: "Are You Done?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code!"
-#    multiplayer_title: "Multiplayer Settings"
-#    multiplayer_link_description: "Give this link to anyone to have them join you."
-#    multiplayer_hint_label: "Hint:"
-#    multiplayer_hint: " Click the link to select all, then press ⌘-C or Ctrl-C to copy the link."
-#    multiplayer_coming_soon: "More multiplayer features to come!"
-#    guide_title: "Guide"
-#    tome_minion_spells: "Your Minions' Spells"
-#    tome_read_only_spells: "Read-Only Spells"
-#    tome_other_units: "Other Units"
+    victory_sign_up: "Cria uma conta para guardar o teu progresso"
+    victory_sign_up_poke: "Queres guardar o teu código? Cria uma conta grátis!"
+    victory_rate_the_level: "Classifica este nível: "
+    victory_play_next_level: "Jogar próximo nível"
+    victory_go_home: "Ir para a Home"
+    victory_review: "Conta-nos mais!"
+    victory_hour_of_code_done: "É tudo?"
+    victory_hour_of_code_done_yes: "Sim, a minha Hora de Código chegou ao fim!"
+    multiplayer_title: "Definições de Multiplayer"
+    multiplayer_link_description: "Dá este link a alguém para se juntar a ti."
+    multiplayer_hint_label: "Dica:"
+    multiplayer_hint: " Carrega no link para seleccionar tudp, depois pressiona ⌘-C ou Ctrl-C para copiar o link."
+    multiplayer_coming_soon: "Mais funcionalidades de multiplayer hão de vir!"
+    guide_title: "Guia"
+    tome_minion_spells: "Feitiços dos teus Minions"
+    tome_read_only_spells: "Feitiços Read-Only"
+    tome_other_units: "Outras Unidades"
 #    tome_cast_button_castable: "Cast"
 #    tome_cast_button_casting: "Casting"
-#    tome_cast_button_cast: "Spell Cast"
+    tome_cast_button_cast: "Lançar Feitiço"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
-#    tome_select_spell: "Select a Spell"
-#    tome_select_a_thang: "Select Someone for "
-#    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+    tome_select_spell: "Escolhe um Feitiço"
+    tome_select_a_thang: "Escolhe Alguém para "
+    tome_available_spells: "Feitiços disponíveis"
+    hud_continue: "Continuar (pressiona shift-space)"
+    spell_saved: "Feitiço Guardado"
 
-#  admin:
-#    av_title: "Admin Views"
-#    av_entities_sub_title: "Entities"
-#    av_entities_users_url: "Users"
-#    av_entities_active_instances_url: "Active Instances"
-#    av_other_sub_title: "Other"
-#    av_other_debug_base_url: "Base (for debugging base.jade)"
-#    u_title: "User List"
-#    lg_title: "Latest Games"
+  admin:
+    av_title: "Visualizações de Admin"
+    av_entities_sub_title: "Entidades"
+    av_entities_users_url: "utilizadores"
+    av_entities_active_instances_url: "Activar Instancias"
+    av_other_sub_title: "Outro"
+    av_other_debug_base_url: "Base (para fazer debug base.jade)"
+    u_title: "Lista de Utilizadores"
+    lg_title: "Últimos Jogos"
 
-#  editor:
-#    main_title: "CodeCombat Editors"
-#    main_description: "Build your own levels, campaigns, units and educational content. We provide all the tools you need!"
-#    article_title: "Article Editor"
-#    article_description: "Write articles that give players overviews of programming concepts which can be used across a variety of levels and campaigns."
-#    thang_title: "Thang Editor"
-#    thang_description: "Build units, defining their default logic, graphics and audio. Currently only supports importing Flash exported vector graphics."
-#    level_title: "Level Editor"
-#    level_description: "Includes the tools for scripting, uploading audio, and constructing custom logic to create all sorts of levels. Everything we use ourselves!"
-#    security_notice: "Many major features in these editors are not currently enabled by default. As we improve the security of these systems, they will be made generally available. If you'd like to use these features sooner, "
-#    contact_us: "contact us!"
-#    hipchat_prefix: "You can also find us in our"
-#    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
-#    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
-#    level_tab_thangs: "Thangs"
-#    level_tab_scripts: "Scripts"
-#    level_tab_settings: "Settings"
-#    level_tab_components: "Components"
-#    level_tab_systems: "Systems"
-#    level_tab_thangs_title: "Current Thangs"
-#    level_tab_thangs_conditions: "Starting Conditions"
-#    level_tab_thangs_add: "Add Thangs"
-#    level_settings_title: "Settings"
-#    level_component_tab_title: "Current Components"
-#    level_component_btn_new: "Create New Component"
-#    level_systems_tab_title: "Current Systems"
-#    level_systems_btn_new: "Create New System"
-#    level_systems_btn_add: "Add System"
-#    level_components_title: "Back to All Thangs"
-#    level_components_type: "Type"
-#    level_component_edit_title: "Edit Component"
-#    level_system_edit_title: "Edit System"
-#    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
-#    new_component_title: "Create New Component"
-#    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
+  editor:
+    main_title: "Editores para CodeCombat"
+    main_description: "Constrói os teus níveis, campanhas, unidades e conteúdo educacional. Nós fornecemos todas as ferramentas que precisas!"
+    article_title: "Editor de Artigos"
+    article_description: "Escreve artigos que dêem aos jogadores uma visão geral dos conceitos de programação que podem ser usados nos mais diversos níveis e campanhas."
+    thang_title: "Editor de Thang"
+    thang_description: "Constrói unidades, definindo a sua logica, visual e audio por defeito. De momento só é suportado 'importing Flash exported vector graphics'."
+    level_title: "Editor de níveis"
+    level_description: "Inclui ferramentas para a criação de scripts, upload de áudio, e construção de lógica personalizada para criar todos os tipos de níveis. Tudo o que nós usamos!"
+    security_notice: "Muitas das principais funcionalidades nestes editores não estão activas por defeito. À medida que a segurança destes sistemas é melhorada, eles serão disponibilizados. Se quiseres utilizar estas uncionalidades mais cedo, "
+    contact_us: "contacta-nos!"
+    hipchat_prefix: "Podes encontrar-nos no nosso"
+    hipchat_url: "canal HipChat."
+    level_some_options: "Algumas opções?"
+    level_tab_thangs: "Thangs"
+    level_tab_scripts: "Scripts"
+    level_tab_settings: "Configurações"
+    level_tab_components: "Componentes"
+    level_tab_systems: "Sistemas"
+    level_tab_thangs_title: "Thangs atuais"
+    level_tab_thangs_conditions: "Condições iniciais"
+    level_tab_thangs_add: "Adiciona Thangs"
+    level_settings_title: "Configurações"
+    level_component_tab_title: "Componentes atuais"
+    level_component_btn_new: "Cria um novo Componente"
+    level_systems_tab_title: "Sistemas atuais"
+    level_systems_btn_new: "Cria um novo Sistema"
+    level_systems_btn_add: "Adiciona um Sistema"
+    level_components_title: "Voltar para Todos os Thangs"
+    level_components_type: "Tipo"
+    level_component_edit_title: "Editar Componente"
+    level_system_edit_title: "Editar Sistema"
+    create_system_title: "Criar novo Sistema"
+    new_component_title: "Criar novo Componente"
+    new_component_field_system: "Sistema"
 
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
+  article:
+    edit_btn_preview: "Visualizar"
+    edit_article_title: "Editar Artigo"
 
-#  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
-#    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
-#    edit_article_title: "Edit Article"
-
-#  general:
-#    and: "and"
+  general:
+    and: "e"
+    or: "ou"
+    name: "Nome"
+    body: "Corpo"
+    version: "Versão"
+    commit_msg: "Mensagem de Commit"
+    version_history_for: "Histórico de versões por: "
+    results: "Resultados"
+    description: "Descrição"
+    email: "E-mail"
+    message: "Mensagem"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"
@@ -446,18 +424,18 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
 #    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"
+    archmage_title_description: "(Coder)"
+    artisan_title: "Artisan"
+    artisan_title_description: "(Construtor de Níveis)"
+    adventurer_title: "Adventurer"
+    adventurer_title_description: "(Play-tester de Níveis)"
+    scribe_title: "Scribe"
+    scribe_title_description: "(Editor de Artigos)"
+    diplomat_title: "Diplomat"
+    diplomat_title_description: "(Tradutor)"
+    ambassador_title: "Ambassador"
+    ambassador_title_description: "(Suporte)"
+    counselor_title: "Counselor"
+    counselor_title_description: "(Expert/ Professor)"

app/locale/pt.coffee

@@ -2,7 +2,15 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
   common:
     loading: "Carregando..."
 #    saving: "Saving..."
-#    sending: "Sending..."
+    sending: "Enviando..."
+    cancel: "Cancelar"
+#    save: "Save"
+    delay_1_sec: "1 segundo"
+    delay_3_sec: "3 segundos"
+    delay_5_sec: "5 segundos"
+    manual: "Manual"
+#    fork: "Fork"
+    play: "Jogar"
 
   modal:
     close: "Fechar"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     page_not_found: "Página não encontrada"
 
   nav:
-    sign_up: "Criar conta"
-    log_in: "Entrar"
-    log_out: "Sair"
     play: "Jogar"
     editor: "Editor"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     twitter_follow: "Seguir"
 #    employers: "Employers"
 
-  forms:
-    name: "Nome"
-    email: "Email"
-    message: "Mensagem"
-    cancel: "Cancelar"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Criar conta"
     log_in: "Entrar"
-    sign_up: "Criar uma nova conta"
-    or: ", ou "
+    log_out: "Sair"
     recover: "recuperar sua conta"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     coppa_why: "(Por quê?)"
     creating: "Criando a nova conta..."
     sign_up: "Criar conta"
-    or: "ou "
     log_in: "Entre com a senha"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     forum_prefix: "Para algo público, por favor acesse "
     forum_page: "nosso fórum"
     forum_suffix: " ao invés disso."
-    sending: "Enviando..."
     send: "Enviar opinião"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     new_password_verify: "Confirmação"
     email_subscriptions: "Assinaturas para Notícias por Email"
     email_announcements: "Notícias"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Receba emails com as últimas notícias e desenvolvimentos do CodeCombat."
     contributor_emails: "Emails para as Classes de Contribuidores"
     contribute_prefix: "Estamos procurando pessoas para se juntar à nossa turma! Confira a nossa "
     contribute_page: "página de contribuição"
     contribute_suffix: " para saber mais."
     email_toggle: "Ativar todos"
-    saving: "Salvando..."
     error_saving: "Erro no salvamento"
     saved: "Alterações Salvas"
     password_mismatch: "As senhas não estão iguais"
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     tome_cast_button_casting: "Conjurando"
     tome_cast_button_cast: "Feitiço"
     tome_autocast_delay: "Atraso na autoconjuração"
-    tome_autocast_1: "1 segundo"
-    tome_autocast_3: "3 segundos"
-    tome_autocast_5: "5 segundos"
-    tome_autocast_manual: "Manual"
     tome_select_spell: "Selecione um Feitiço"
     tome_select_a_thang: "Selecione alguém para "
     tome_available_spells: "Feitiços Disponíveis"
     hud_continue: "Continue (tecle Shift+Space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "ou"
+    name: "Nome"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Email"
+    message: "Mensagem"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/ro.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/ru.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "русский язык", englishDescription: "Russian", translation:
   common:
     loading: "Загрузка..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Сохранение..."
+    sending: "Отправка..."
+    cancel: "Отмена"
+    save: "Сохранить"
+    delay_1_sec: "1 секунда"
+    delay_3_sec: "3 секунды"
+    delay_5_sec: "5 секунд"
+    manual: "Вручную"
+#    fork: "Fork"
+    play: "Играть"
 
   modal:
     close: "Закрыть"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
     page_not_found: "Страница не найдена"
 
   nav:
-    sign_up: "Создать Профиль"
-    log_in: "Войти"
-    log_out: "Выйти"
     play: "Играть"
     editor: "Редактор"
     blog: "Блог"
@@ -26,18 +31,10 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
     about: "О нас"
     contact: "Контакты"
     twitter_follow: "Подписаться"
-#    employers: "Employers"
-
-  forms:
-    name: "Имя"
-    email: "Email"
-    message: "Сообщение"
-    cancel: "Отмена"
-#    save: "Save"
+    employers: "Работодателям"
 
 #  versions:
-#    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
+    save_version_title: "Сохранить новую версию"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,15 +42,14 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Создать Профиль"
     log_in: "Войти"
-    sign_up: "создать аккаунт"
-    or: ", или"
+    log_out: "Выйти"
     recover: "восстановить аккаунт"
 
-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Восстановить аккаунт"
+    send_password: "Отправить пароль для восстановления"
 
   signup:
 #    create_account_title: "Create Account to Save Progress"
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
     coppa_why: "(Почему?)"
     creating: "Создание аккаунта..."
     sign_up: "Регистрация"
-    or: "или "
     log_in: "вход с паролем"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
     forum_prefix: "Для любых публичных обсуждений, пожалуйста, используйте "
     forum_page: "наш форум"
     forum_suffix: "."
-    sending: "Отправка..."
     send: "Отправить отзыв"
 
   diplomat_suggestion:
@@ -107,8 +101,8 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
     learn_more: "Узнать о том, как стать Дипломатом"
     subscribe_as_diplomat: "Зарегистрироваться как Дипломат"
 
-#  wizard_settings:
-#    title: "Wizard Settings"
+  wizard_settings:
+    title: "Мастер настройки"
 #    customize_avatar: "Customize Your Avatar"
 
   account_settings:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
     new_password_verify: "Подтверждение пароля"
     email_subscriptions: "Email-подписки"
     email_announcements: "Оповещения"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Получать email-оповещения о последних новостях CodeCombat."
     contributor_emails: "Рассылки по классам участников"
     contribute_prefix: "Нам нужны люди, которые присоединятся к нашей команде! Зайдите на "
     contribute_page: "страницу участников,"
     contribute_suffix: " чтобы узнать больше."
     email_toggle: "Отметить всё"
-    saving: "Сохранение..."
     error_saving: "Ошибка сохранения"
     saved: "Изменения сохранены"
     password_mismatch: "Пароли не совпадают."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
     tome_cast_button_casting: "Заклинание читается"
     tome_cast_button_cast: "Заклинание прочитано"
     tome_autocast_delay: "Задержка автоматического чтения"
-    tome_autocast_1: "1 секунда"
-    tome_autocast_3: "3 секунды"
-    tome_autocast_5: "5 секунд"
-    tome_autocast_manual: "Вручную"
     tome_select_spell: "Выбрать заклинание"
     tome_select_a_thang: "Выбрать кого-нибудь для "
     tome_available_spells: "Доступные заклинания"
     hud_continue: "Продолжить (нажмите Shift+Space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "или"
+    name: "Имя"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Email"
+    message: "Сообщение"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"
@@ -446,18 +424,18 @@ module.exports = nativeDescription: "русский язык", englishDescriptio
 #    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: "(эксперт/учитель)"

app/locale/sk.coffee

@@ -2,7 +2,15 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
   common:
     loading: "Načítava sa..."
 #    saving: "Saving..."
-#    sending: "Sending..."
+    sending: "Odosiela sa..."
+    cancel: "Zrušiť"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+    play: "Hrať"
 
   modal:
     close: "Zatvoriť"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     page_not_found: "Stránka nenájdená"
 
   nav:
-    sign_up: "Vytvoriť účet"
-    log_in: "Prihlásiť sa"
-    log_out: "Odhlásiť sa"
     play: "Hrať"
     editor: "Editor"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     twitter_follow: "Sledovať"
 #    employers: "Employers"
 
-  forms:
-    name: "Meno"
-    email: "Email"
-    message: "Správa"
-    cancel: "Zrušiť"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Vytvoriť účet"
     log_in: "Prihlásiť sa"
-    sign_up: "vytvoriť nový účet"
-    or: ", alebo o"
+    log_out: "Odhlásiť sa"
     recover: "obnoviť účet"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     coppa_why: "(Prečo?)"
     creating: "Vytvára sa účet..."
     sign_up: "Registrovať sa"
-    or: "alebo "
     log_in: "prihlásiť sa pomocou hesla"
 
   home:
@@ -96,14 +91,13 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     forum_prefix: "Pre všetky ostatné verejné záležitosti, prosím vyskúšajte "
     forum_page: "naše fórum"
     forum_suffix: "."
-    sending: "Odosiela sa..."
     send: "Poslať odozvu"
 
   diplomat_suggestion:
 #    title: "Help translate CodeCombat!"
 #    sub_heading: "We need your language skills."
     pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Slovak 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 Slovak."
-#    missing_translations: "Until we can translate everything into {English}, you'll see English when {English} isn't available."
+    missing_translations: "Until we can translate everything into Slovak, you'll see English when Slovak isn't available."
 #    learn_more: "Learn more about being a Diplomat"
 #    subscribe_as_diplomat: "Subscribe as a Diplomat"
 
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "alebo"
+    name: "Meno"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Email"
+    message: "Správa"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/sl.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/sr.coffee

@@ -1,206 +1,197 @@
 module.exports = nativeDescription: "српски", englishDescription: "Serbian", translation:
   common:
-    loading: "Loading..."
-#    saving: "Saving..."
-#    sending: "Sending..."
-
-#  modal:
-#    close: "Close"
-#    okay: "Okay"
-
-#  not_found:
-#    page_not_found: "Page not found"
-
-#  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
-#    play: "Levels"
-#    editor: "Editor"
-#    blog: "Blog"
-#    forum: "Forum"
-#    admin: "Admin"
-#    home: "Home"
-#    contribute: "Contribute"
-#    legal: "Legal"
-#    about: "About"
-#    contact: "Contact"
-#    twitter_follow: "Follow"
-#    employers: "Employers"
-
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
+    loading: "Учитавање"
+    saving: "Чување..."
+    sending: "Шаље се..."
+    cancel: "Откажи"
 #    save: "Save"
+    delay_1_sec: "1 секунда"
+    delay_3_sec: "3 секунде"
+    delay_5_sec: "5 секунди"
+    manual: "Упутство"
+#    fork: "Fork"
+    play: "Нивои"
+
+  modal:
+    close: "Затвори"
+    okay: "ОК"
+
+  not_found:
+    page_not_found: "Страница није нађена"
+
+  nav:
+    play: "Нивои"
+    editor: "Уређивач"
+    blog: "Блог"
+    forum: "Форум"
+    admin: "Админ"
+    home: "Почетна"
+    contribute: "Допринеси"
+    legal: "Право"
+    about: "О нама"
+    contact: "Контакт"
+    twitter_follow: "Прати"
+#    employers: "Employers"
 
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
 #    cla_suffix: "."
 #    cla_agree: "I AGREE"
 
-#  login:
-#    login_modal_title: "Log In"
-#    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
-#    recover: "recover account"
+  login:
+    sign_up: "Направи Налог"
+    log_in: "Улогуј Се"
+    log_out: "Излогуј Се"
+    recover: "Поврати налог"
 
-#  recover:
-#    recover_account_title: "Recover Account"
+  recover:
+    recover_account_title: "Поврати налог"
 #    send_password: "Send Recovery Password"
 
-#  signup:
+  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"
-#    or: "or "
-#    log_in: "log in with password"
+    description: "Бесплатно је. Још само пар ствари и готово:"
+    email_announcements: "Примај обавештења на мејл"
+    coppa: "13+ или ван САД "
+    coppa_why: "(Зашто?)"
+    creating: "Прављење налога..."
+    sign_up: "Упиши се"
+    log_in: "улогуј се са шифром"
 
-#  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"
+  home:
+    slogan: "Научи да пишеш JavaScript играјући игру"
+    no_ie: "CodeCombat не ради у IE8 и старијим верзијама. Жао нам је!"
+    no_mobile: "CodeCombat није дизајниран за мобилне уређаје и може да се деси да не ради!"
+    play: "Играј"
 
-#  play:
-#    choose_your_level: "Choose Your Level"
-#    adventurer_prefix: "You can jump to any level below, or discuss the levels on "
-#    adventurer_forum: "the Adventurer forum"
-#    adventurer_suffix: "."
-#    campaign_beginner: "Beginner Campaign"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
-#    campaign_player_created: "Player-Created"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
+  play:
+    choose_your_level: "Изабери ниво"
+    adventurer_prefix: "Можеш изабрати било који ниво испод, или разговарај о нивоима на "
+    adventurer_forum: "форуму Авантуриста"
+    adventurer_suffix: "."
+    campaign_beginner: "Почетничка кампања"
+    campaign_beginner_description: "... у којој учиш магију програмирања."
+    campaign_dev: "Насумични тежи нивои"
+    campaign_dev_description: "... у којима учиш о интерфејсу док радиш нешто теже."
+    campaign_multiplayer: "Арене за више играча"
+    campaign_multiplayer_description: "... у којима кодираш 1 на 1 мечеве против осталих играча."
+    campaign_player_created: "Направљено од стране играча"
+    campaign_player_created_description: "... у којима се бориш против креативности својих колега."
+    level_difficulty: "Тежина: "
 
-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
-#    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
+  contact:
+    contact_us: "Контактирај CodeCombat"
+    welcome: "Драго нам је што нас контактираш! Искористи ову форму да нам пошаљеш мејл. "
+    contribute_prefix: "Ако си заинтересован да допринесеш пројекту, посети нашу "
+    contribute_page: "страницу за допринос"
+    contribute_suffix: "!"
+    forum_prefix: "За било шта јавно, посети "
+    forum_page: "наш форум."
 #    forum_suffix: " instead."
-#    sending: "Sending..."
-#    send: "Send Feedback"
+    send: "Пошаљи повратну информацију"
 
   diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Serbian 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 Serbian."
-    missing_translations: "Until we can translate everything into Serbian, you'll see English when Serbian isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    title: "Помози нам у превођењу CodeCombat-а!"
+    sub_heading: "WПотребне су нам твоје језичке способности."
+    pitch_body: "Развијамо CodeCombat на енглеском, али већ имамо играче из целог света. Многи од њих желе да играју на српском јер не говоре енглески, па ако говориш оба, молимо те да размислиш о томе да нам помогнеш да преведемо CodeCombat сајт, као и све нивое на српски."
+    missing_translations: "Док не преведемо све на српски видећеш све на енглеском, док српски не буде доступан."
+    learn_more: "Информиши се више о Дипломатама"
+    subscribe_as_diplomat: "Претплати се као Дипломата"
 
 #  wizard_settings:
 #    title: "Wizard Settings"
 #    customize_avatar: "Customize Your Avatar"
 
-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
-#    me_tab: "Me"
-#    picture_tab: "Picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
-#    gravatar_select: "Select which Gravatar photo to use"
-#    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
-#    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
-#    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
-#    contributor_emails: "Contributor Class Emails"
-#    contribute_prefix: "We're looking for people to join our party! Check out the "
-#    contribute_page: "contribute page"
-#    contribute_suffix: " to find out more."
-#    email_toggle: "Toggle All"
-#    saving: "Saving..."
-#    error_saving: "Error Saving"
-#    saved: "Changes Saved"
-#    password_mismatch: "Password does not match."
+  account_settings:
+    title: "Подешавања налога"
+    not_logged_in: "Улогуј се или направи налог како би могао да измениш подешавања."
+    autosave: "Измене се чувају аутоматски"
+    me_tab: "Ја"
+    picture_tab: "Фотографија"
+    wizard_tab: "Чаробњак"
+    password_tab: "Шифра"
+    emails_tab: "Мејлови"
+    gravatar_select: "Изабери Граватар фотографију "
+    gravatar_add_photos: "Додај сличице и фотографије за Граватар налог за свој мејл да изабереш слику."
+    gravatar_add_more_photos: "Додај још слика на свој Граватар налог да би им приступио овде."
+    wizard_color: "Боја Одеће Чаробњака"
+    new_password: "Нова Шифра"
+    new_password_verify: "Потврди"
+    email_subscriptions: "Мејл претплате"
+    email_announcements: "Обавештења"
+#    email_notifications_description: "Get periodic notifications for your account."
+    email_announcements_description: "Прими мејл за најновије вести и достигнућа на CodeCombat-у"
+    contributor_emails: "Мејлови реда сарадника"
+    contribute_prefix: "Тражимо људе који би нам се придружили! Погледај "
+    contribute_page: "страницу за сарадњу"
+    contribute_suffix: " да сазнаш више о томе."
+    email_toggle: "Обухвати све"
+    error_saving: "Чување грешке..."
+    saved: "Измене су сачуване"
+    password_mismatch: "Шифре се не слажу."
 
-#  account_profile:
-#    edit_settings: "Edit Settings"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    profile: "Profile"
-#    user_not_found: "No user found. Check the URL?"
-#    gravatar_not_found_mine: "We couldn't find your profile associated with:"
-#    gravatar_not_found_email_suffix: "."
-#    gravatar_signup_prefix: "Sign up at "
-#    gravatar_signup_suffix: " to get set up!"
-#    gravatar_not_found_other: "Alas, there's no profile associated with this person's email address."
-#    gravatar_contact: "Contact"
-#    gravatar_websites: "Websites"
-#    gravatar_accounts: "As Seen On"
-#    gravatar_profile_link: "Full Gravatar Profile"
+  account_profile:
+    edit_settings: "Измени подешавања"
+    profile_for_prefix: "Налог за "
+    profile_for_suffix: ""
+    profile: "Налог"
+    user_not_found: "Корисник није пронађен. Проверите УРЛ?"
+    gravatar_not_found_mine: "Нисмо могли да пронађемо твој налог који је повезан са:"
+    gravatar_not_found_email_suffix: "."
+    gravatar_signup_prefix: "Упиши се на "
+    gravatar_signup_suffix: " да би се припремио!"
+    gravatar_not_found_other: "Нажалост, не постоји налог повезан са дотичном мејл адресом."
+    gravatar_contact: "Контакт"
+    gravatar_websites: "Веб сајтови"
+    gravatar_accounts: "Као што је виђено на"
+    gravatar_profile_link: "Цео Граватар налог"
 
-#  play_level:
-#    level_load_error: "Level could not be loaded."
-#    done: "Done"
-#    grid: "Grid"
-#    customize_wizard: "Customize Wizard"
-#    home: "Home"
-#    guide: "Guide"
-#    multiplayer: "Multiplayer"
-#    restart: "Restart"
-#    goals: "Goals"
-#    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
-#    reload_title: "Reload All Code?"
-#    reload_really: "Are you sure you want to reload this level back to the beginning?"
-#    reload_confirm: "Reload All"
-#    victory_title_prefix: ""
-#    victory_title_suffix: " Complete"
-#    victory_sign_up: "Sign Up to Save Progress"
-#    victory_sign_up_poke: "Want to save your code? Create a free account!"
-#    victory_rate_the_level: "Rate the level: "
-#    victory_play_next_level: "Play Next Level"
-#    victory_go_home: "Go Home"
-#    victory_review: "Tell us more!"
-#    victory_hour_of_code_done: "Are You Done?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code!"
-#    multiplayer_title: "Multiplayer Settings"
-#    multiplayer_link_description: "Give this link to anyone to have them join you."
-#    multiplayer_hint_label: "Hint:"
-#    multiplayer_hint: " Click the link to select all, then press ⌘-C or Ctrl-C to copy the link."
-#    multiplayer_coming_soon: "More multiplayer features to come!"
-#    guide_title: "Guide"
-#    tome_minion_spells: "Your Minions' Spells"
-#    tome_read_only_spells: "Read-Only Spells"
-#    tome_other_units: "Other Units"
-#    tome_cast_button_castable: "Cast"
-#    tome_cast_button_casting: "Casting"
-#    tome_cast_button_cast: "Spell Cast"
-#    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
-#    tome_select_spell: "Select a Spell"
-#    tome_select_a_thang: "Select Someone for "
-#    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+  play_level:
+    level_load_error: "Ниво није могао бити учитан."
+    done: "Урађено"
+    grid: "Мрежа"
+    customize_wizard: "Прилагоди Чаробњака"
+    home: "Почетна"
+    guide: "Водич"
+    multiplayer: "Мод за више играча"
+    restart: "Поновно учитавање"
+    goals: "Циљеви"
+    action_timeline: "Временска линија акције"
+    click_to_select: "Кликни на јединицу да је селектујеш"
+    reload_title: "Поновно учитавање целог кода?"
+    reload_really: "Да ли сте сигурни да желите да кренете ниво испочетка?"
+    reload_confirm: "Поновно учитавање свега"
+    victory_title_prefix: ""
+    victory_title_suffix: " Завршено"
+    victory_sign_up: "Пријави се за новости"
+    victory_sign_up_poke: "Желиш ли да примаш најновије вести на мејл? Направи бесплатан налог и ми ћемо те обавештавати!"
+    victory_rate_the_level: "Оцени ниво: "
+    victory_play_next_level: "Играј следећи ниво"
+    victory_go_home: "Иди на почетну"
+    victory_review: "Реци нам више!"
+    victory_hour_of_code_done: "Јеси ли завршио?"
+    victory_hour_of_code_done_yes: "Да, завршио сам свој Сат Кода!"
+    multiplayer_title: "Подешавање мода за више играча"
+    multiplayer_link_description: "Дај овај линк онима које желиш да ти се придруже."
+    multiplayer_hint_label: "Мала помоћ"
+    multiplayer_hint: " Кликни на линк да обележиш све, затим притисни Apple-C или Ctrl-C да копираш линк."
+    multiplayer_coming_soon: "Стиже још нових карактеристика!"
+    guide_title: "Водич"
+    tome_minion_spells: "Чини твојих поданика"
+    tome_read_only_spells: "Чини које се могу само гледати"
+    tome_other_units: "Остале јединице"
+    tome_cast_button_castable: "Баци"
+    tome_cast_button_casting: "Бацање"
+    tome_cast_button_cast: "Баци чини"
+    tome_autocast_delay: "Размак између аутоматског бацања чини"
+    tome_select_spell: "Изабери чин"
+    tome_select_a_thang: "Изабери неког за "
+    tome_available_spells: "Доступне чини"
+    hud_continue: "Настави (притисни ентер)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "или"
+    name: "Име"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "Мејл"
+    message: "Порука"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/sv.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", translation:
   common:
     loading: "Laddar..."
-#    saving: "Saving..."
+    saving: "Sparar..."
 #    sending: "Sending..."
+    cancel: "Avbryt"
+#    save: "Save"
+    delay_1_sec: "1 sekund"
+    delay_3_sec: "3 sekunder"
+    delay_5_sec: "5 sekunder"
+    manual: "Manuellt"
+#    fork: "Fork"
+#    play: "Play"
 
   modal:
     close: "Stäng"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     page_not_found: "Sidan kan inte hittas"
 
   nav:
-    sign_up: "Skapa Konto"
-    log_in: "Logga In"
-    log_out: "Logga Ut"
     play: "Spela"
     editor: "Nivåredigerare"
     blog: "Blogg"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     twitter_follow: "Följ oss på Twitter"
 #    employers: "Employers"
 
-  forms:
-    name: "Namn"
-    email: "E-post"
-    message: "Meddelande"
-    cancel: "Avbryt"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Skapa Konto"
     log_in: "Logga In"
-    sign_up: "skapa konto"
-    or: ", eller "
+    log_out: "Logga Ut"
     recover: "glömt lösenord"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     coppa_why: "(Varför?)"
     creating: "Skapar Konto..."
     sign_up: "Skapa Konto"
-    or: "eller "
     log_in: "logga in med lösenord"
 
   home:
@@ -134,7 +129,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     contribute_page: "bidragarsida"
     contribute_suffix: " tför att få veta mer."
     email_toggle: "Växla Alla"
-    saving: "Sparar..."
     error_saving: "Ett Fel Uppstod Vid Sparningen"
     saved: "Ändringar Sparade"
     password_mismatch: "De angivna lösenorden stämmer inte överens."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-    tome_autocast_1: "1 sekund"
-    tome_autocast_3: "3 sekunder"
-    tome_autocast_5: "5 sekunder"
-    tome_autocast_manual: "Manuellt"
     tome_select_spell: "Välj en Förmåga"
     tome_select_a_thang: "Välj Någon för "
     tome_available_spells: "Tillgängliga Förmågor"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+    or: "eller"
+    name: "Namn"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "E-post"
+    message: "Meddelande"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/th.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     loading: "รอสักครู่..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+    cancel: "ยกเลิก"
+#    save: "Save"
+    delay_1_sec: "1 วินาที"
+    delay_3_sec: "3 วินาที"
+    delay_5_sec: "5 วินาที"
+#    manual: "Manual"
+#    fork: "Fork"
+    play: "เล่น"
 
   modal:
     close: "ปิด"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     page_not_found: "ขออภัย ไม่พบหน้าเว็บที่คุณต้องการ"
 
   nav:
-    sign_up: "ลงทะเบียนใหม่"
-    log_in: "ลงชื่อเข้าใช้"
-    log_out: "ลงชื่ื่อออก"
     play: "เล่น"
     editor: "Editor"
     blog: "บล็อก"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     twitter_follow: "Follow me!"
 #    employers: "Employers"
 
-  forms:
-    name: "ชื่อ"
-    email: "อีเมลล์"
-    message: "ข้อความ"
-    cancel: "ยกเลิก"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "ลงชื่อเข้าใช้"
     sign_up: "ลงทะเบียนใหม่"
-    or: "หรือ"
+    log_in: "ลงชื่อเข้าใช้"
+    log_out: "ลงชื่ื่อออก"
     recover: "กู้บัญชีการใช้งาน"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     coppa_why: "(ทำไม?)"
 #    creating: "Creating Account..."
     sign_up: "สมัคร"
-    or: "หรือ"
     log_in: "เข้าสู่ระบบด้วยรหัสผ่าน"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-    tome_autocast_1: "1 วินาที"
-    tome_autocast_3: "3 วินาที"
-    tome_autocast_5: "5 วินาที"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+    or: "หรือ"
+    name: "ชื่อ"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "อีเมลล์"
+    message: "ข้อความ"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/tr.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     loading: "Yükleniyor..."
     saving: "Kaydediliyor..."
     sending: "Gönderiliyor..."
+    cancel: "İptal"
+    save: "Kaydet"
+    delay_1_sec: "1 saniye"
+    delay_3_sec: "3 saniye"
+    delay_5_sec: "5 saniye"
+    manual: "El ile"
+    fork: "Çatalla"
+    play: "Oyna"
 
   modal:
     close: "Kapat"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     page_not_found: "Sayfa bulunamadı"
 
   nav:
-    sign_up: "Kaydol"
-    log_in: "Giriş Yap"
-    log_out: "Çıkış Yap"
     play: "Oyna"
     editor: "Düzenleyici"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     twitter_follow: "Takip et"
     employers: "İş Verenler"
 
-  forms:
-    name: "İsim"
-    email: "E-posta"
-    message: "İleti"
-    cancel: "İptal"
-    save: "Kaydet"
-
-#  versions:
+  versions:
     save_version_title: "Yeni Sürümü Kaydet"
-    commit_message: "Gönderme İletisi"
     new_major_version: "Yeni Önemli Sürüm"
     cla_prefix: "Değişiklikleri kaydetmek için ilk olarak"
     cla_url: "KLA'mızı"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     cla_agree: "KABUL EDİYORUM"
 
   login:
-#    login_modal_title: "Log In"
+    sign_up: "Kaydol"
     log_in: "Giriş Yap"
-    sign_up: "Yeni hesap oluşturabilir,"
-    or: " ya da mevcut hesabınızın şifresini unuttuysanız"
+    log_out: "Çıkış Yap"
     recover: "şifrenizi sıfırlayabilirsiniz."
 
   recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     coppa_why: "(Bu nedir?)"
     creating: "Hesap oluşturuluyor..."
     sign_up: "Kaydol"
-    or: "Zaten hesabınız varsa"
     log_in: "buradan giriş yapabilirsiniz."
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     forum_prefix: "Daha kamuya açık soru ve görüşleriniz için "
     forum_page: "forumumuzu"
     forum_suffix: " kullanabilirsiniz."
-    sending: "Gönderiliyor."
     send: "Gönder"
 
   diplomat_suggestion:
@@ -128,20 +122,20 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     new_password_verify: "Teyit Et"
     email_subscriptions: "E-posta Abonelikleri"
     email_announcements: "Duyurular"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "CodeCombat ile ilgili son haberlere ve gelişmelere ulaşın."
     contributor_emails: "İştirakçi Sınıfı E-postaları"
     contribute_prefix: "Partimize katılmak üzere sizleri bekliyoruz ! Detaylı bilgi için "
     contribute_page: "katkı sayfasını"
     contribute_suffix: " ziyaret edebilirsiniz."
     email_toggle: "Tümünü Değiştir"
-    saving: "Kaydediliyor..."
     error_saving: "Kayıt Esnasında Hata"
     saved: "Değişiklikler Kaydedildi"
     password_mismatch: "Şifreler Uyuşmuyor"
 
   account_profile:
     edit_settings: "Ayarları Düzenle"
-#    profile_for_prefix: ""
+    profile_for_prefix: ""
     profile_for_suffix: " Kullanıcısının Profili"
     profile: "Profil"
     user_not_found: "Kullanıcı bulunamadı. URL'den emin misiniz?"
@@ -170,7 +164,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     reload_title: "Tüm kod yeniden yüklensin mi?"
     reload_really: "Bu seviyeyi en baştan yüklemek istediğinizden emin misiniz?"
     reload_confirm: "Tümünü Yeniden Yükle"
-#    victory_title_prefix: ""
+    victory_title_prefix: ""
     victory_title_suffix: "Tamamlandı "
     victory_sign_up: " Güncellemelere Abone Ol"
     victory_sign_up_poke: "Son haberleri e-postanızda görmek ister misiniz? Ücretsiz bir hesap oluşturmanız durumunda sizi bilgilendirebiliriz."
@@ -193,24 +187,21 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     tome_cast_button_casting: "Fırlatılıyor"
     tome_cast_button_cast: "Fırlat"
     tome_autocast_delay: "Otomatik-Fırlatma Gecikmesi"
-    tome_autocast_1: "1 saniye"
-    tome_autocast_3: "3 saniye"
-    tome_autocast_5: "5 saniye"
-    tome_autocast_manual: "El ile"
     tome_select_spell: "Bir Büyü Seç"
     tome_select_a_thang: "Birini seç..."
     tome_available_spells: "Kullanılabilir Büyüler"
     hud_continue: "Devam (ÜstKarakter+Boşluk)"
+#    spell_saved: "Spell Saved"
 
-#  admin:
-#    av_title: "Admin Views"
-#    av_entities_sub_title: "Entities"
-#    av_entities_users_url: "Users"
-#    av_entities_active_instances_url: "Active Instances"
-#    av_other_sub_title: "Other"
-#    av_other_debug_base_url: "Base (for debugging base.jade)"
-#    u_title: "User List"
-#    lg_title: "Latest Games"
+  admin:
+    av_title: "Yönetici Görünümleri"
+    av_entities_sub_title: "Ortaklıklar"
+    av_entities_users_url: "Kullanıcılar"
+    av_entities_active_instances_url: "Aktif Örnekler"
+    av_other_sub_title: "Başka"
+    av_other_debug_base_url: "Temel (base.jade hata kontrolü)"
+    u_title: "Kullanıcı Listesi"
+    lg_title: "Yeni Oyunlar"
 
   editor:
     main_title: "CodeCombat Düzenleyici"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     contact_us: "bize ulaşın!"
     hipchat_prefix: "Bizi ayrıca"
     hipchat_url: "HipChat otasında bulabilirsiniz."
-    level_btn_save: "Kaydet"
-    level_btn_fork: "Çatalla"
-    level_btn_play: "Oyna"
     level_some_options: "Bazı Seçenekler?"
-    level_options_1_second: "1 saniye"
-    level_options_3_seconds: "3 saniye"
-    level_options_5_seconds: "5 saniye"
-    level_options_manual: "Kılavuz"
     level_tab_thangs: "Nesneler"
     level_tab_scripts: "Betikler"
     level_tab_settings: "Ayarlar"
@@ -252,36 +236,29 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     level_component_edit_title: "Bileşen Düzenle"
     level_system_edit_title: "Sistem Düzenle"
     create_system_title: "Yeni Sistem Oluştur"
-    create_system_field_name: "İsim"
-    create_system_btn_cancel: "İptal"
-    create_system_btn_create: "Oluştur"
     new_component_title: "Yeni Bileşen Oluştur"
     new_component_field_system: "Sistem"
-    new_component_field_name: "İsim"
-    new_component_btn_cancel: "İptal"
-    new_component_btn_create: "Oluştur"
-
-  level:
-    index_table_results: "Sonuçlar"
-    index_table_name: "İsim"
-    index_table_description: "Açıklama"
-    index_table_version: "Sürüm"
 
   article:
-    index_table_results: "Sonuçlar"
-    index_table_name: "İsim"
-    index_table_body: "Gövde"
-    index_table_version: "Sürüm"
     edit_btn_preview: "Önizleme"
-    edit_btn_save: "Kaynet"
     edit_article_title: "Makaleyi Düzenle"
 
   general:
     and: "ve"
+    or: "veya"
+    name: "İsim"
+    body: "Gövde"
+    version: "Sürüm"
+    commit_msg: "Gönderme İletisi"
+#    version_history_for: "Version History for: "
+    results: "Sonuçlar"
+    description: "Açıklama"
+    email: "E-posta"
+    message: "İleti"
 
-#  about:
-#    who_is_codecombat: "Who is CodeCombat?"
-#    why_codecombat: "Why CodeCombat?"
+  about:
+    who_is_codecombat: "CodeCombat kimdir?"
+    why_codecombat: "Neden CodeCombat?"
 #    who_description_prefix: "together started CodeCombat in 2013. We also created "
 #    who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters."
 #    who_description_ending: "Now it's time to teach people to write code."
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"
@@ -446,7 +424,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    translating_diplomats: "Our Translating Diplomats:"
 #    helpful_ambassadors: "Our Helpful Ambassadors:"
 
-#  classes:
+  classes:
     archmage_title: "Büyük Büyücü"
     archmage_title_description: "(Kod Yazarı)"
     artisan_title: "Zanaatkar"

app/locale/uk.coffee

@@ -261,23 +261,20 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    new_component_btn_cancel: "Cancel"
 #    new_component_btn_create: "Create"
 
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
-
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
 #    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +361,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/ur.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
     loading: "Loading..."
 #    saving: "Saving..."
 #    sending: "Sending..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
 #  modal:
 #    close: "Close"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    page_not_found: "Page not found"
 
 #  nav:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    cla_agree: "I AGREE"
 
 #  login:
-#    login_modal_title: "Log In"
+#    sign_up: "Create Account"
 #    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+#    log_out: "Log Out"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+#    name: "Name"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/vi.coffee

@@ -3,6 +3,14 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     loading: "Tải..."
     saving: "Lưu..."
     sending: "Gởi..."
+#    cancel: "Cancel"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+#    play: "Play"
 
   modal:
     close: "Đóng"
@@ -11,10 +19,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
   not_found:
     page_not_found: "không tìm thấy trang"
 
-  nav:
-    sign_up: "Tạo tài khoản"
-    log_in: "Đăng nhập"
-    log_out: "Đăng xuất"
+#  nav:
 #    play: "Levels"
 #    editor: "Editor"
 #    blog: "Blog"
@@ -28,27 +33,18 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    twitter_follow: "Follow"
 #    employers: "Employers"
 
-#  forms:
-#    name: "Name"
-#    email: "Email"
-#    message: "Message"
-#    cancel: "Cancel"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
 #    cla_suffix: "."
 #    cla_agree: "I AGREE"
 
-#  login:
-#    login_modal_title: "Log In"
-#    log_in: "Log In"
-#    sign_up: "create new account"
-#    or: ", or "
+  login:
+    sign_up: "Tạo tài khoản"
+    log_in: "Đăng nhập"
+    log_out: "Đăng xuất"
 #    recover: "recover account"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    coppa_why: "(Why?)"
 #    creating: "Creating Account..."
 #    sign_up: "Sign Up"
-#    or: "or "
 #    log_in: "log in with password"
 
 #  home:
@@ -96,14 +91,13 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
-#  diplomat_suggestion:
+  diplomat_suggestion:
 #    title: "Help translate CodeCombat!"
 #    sub_heading: "We need your language skills."
-#    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Vietnamese 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 Vietnamese."
-#    missing_translations: "Until we can translate everything into Vietnamese, you'll see English when Vietnamese isn't available."
+    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Vietnamese 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 Vietnamese."
+    missing_translations: "Until we can translate everything into Vietnamese, you'll see English when Vietnamese isn't available."
 #    learn_more: "Learn more about being a Diplomat"
 #    subscribe_as_diplomat: "Subscribe as a Diplomat"
 
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,28 +236,25 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
 
 #  article:
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
 #    name: "Name"
+#    body: "Body"
 #    version: "Version"
 #    commit_msg: "Commit Message"
 #    version_history_for: "Version History for: "
 #    results: "Results"
 #    description: "Description"
+#    or: "or"
+#    email: "Email"
+#    message: "Message"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -360,6 +341,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/zh-HANS.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "简体中文", englishDescription: "Chinese (Simplified)", translation:
-#  common:
-#    loading: "Loading..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+  common:
+    loading: "读取中..."
+    saving: "保存中……"
+    sending: "发送中..."
+    cancel: "退出"
+#    save: "Save"
+    delay_1_sec: "1 秒"
+    delay_3_sec: "3 秒"
+    delay_5_sec: "5 秒"
+    manual: "手动"
+#    fork: "Fork"
+    play: "玩"
 
   modal:
     close: "关闭"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     page_not_found: "找不到网页"
 
   nav:
-    sign_up: "注册"
-    log_in: "登录"
-    log_out: "登出"
     play: "玩"
     editor: "编辑"
     blog: "博客"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     twitter_follow: "关注"
 #    employers: "Employers"
 
-  forms:
-    name: "名字"
-    email: "邮箱"
-    message: "留言"
-    cancel: "退出"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,25 +42,23 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "登录"
     sign_up: "注册"
-    or: "，或"
+    log_in: "登录"
+    log_out: "登出"
     recover: "找回账户"
 
-#  recover:
-#    recover_account_title: "Recover Account"
+  recover:
+    recover_account_title: "找回账户"
 #    send_password: "Send Recovery Password"
 
   signup:
 #    create_account_title: "Create Account to Save Progress"
     description: "这是免费的。简单易学："
     email_announcements: "通过邮件接收通知"
-#    coppa: "13+ or non-USA "
+    coppa: "13 岁以上或非美国用户"
     coppa_why: "为什么？"
     creating: "账户创建中..."
     sign_up: "注册"
-    or: "或"
     log_in: "登录"
 
   home:
@@ -96,16 +91,15 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     forum_prefix: "对任何公共部分，放手去干吧 "
     forum_page: "我们的论坛"
     forum_suffix: "代替。"
-    sending: "发送中。。。"
     send: "意见反馈"
 
   diplomat_suggestion:
     title: "帮我们翻译CodeCombat"
     sub_heading: "我们需要您的语言技能"
     pitch_body: "我们开发了CodeCombat的英文版，但是现在我们的玩家遍布全球。很多人想玩中文（简体）版的，却不会说英语，所以如果你中英文都会，请考虑一下参加我们的翻译工作，帮忙把 CodeCombat 网站还有所有的关卡翻译成中文（简体）。"
-#    missing_translations: "Until we can translate everything into {English}, you'll see English when {English} isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    missing_translations: "未翻译的文本将显示为英文。"
+    learn_more: "了解更多有关成为翻译人员的说明"
+    subscribe_as_diplomat: "提交翻译人员申请"
 
 #  wizard_settings:
 #    title: "Wizard Settings"
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     new_password_verify: "核实"
     email_subscriptions: "邮箱验证"
     email_announcements: "通知"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "接收关于 CodeCombat 最近的新闻和发展的邮件。"
-#    contributor_emails: "Contributor Class Emails"
+    contributor_emails: "贡献者通知"
     contribute_prefix: "我们在寻找志同道合的人！请到 "
     contribute_page: "贡献页面"
     contribute_suffix: " 查看更多信息。"
     email_toggle: "切换所有"
-    saving: "保存中..."
     error_saving: "保存时出错"
     saved: "保存修改"
     password_mismatch: "密码不匹配。"
@@ -152,7 +146,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     gravatar_not_found_other: "哎呀，没有与这个人的邮箱相关的资料。"
     gravatar_contact: "联系"
     gravatar_websites: "网站"
-#    gravatar_accounts: "As Seen On"
+    gravatar_accounts: "显示为"
     gravatar_profile_link: "完善 Gravatar 资料"
 
   play_level:
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tome_cast_button_casting: "发动中"
     tome_cast_button_cast: "发动咒语"
     tome_autocast_delay: "自动施法延迟"
-    tome_autocast_1: "1 秒"
-    tome_autocast_3: "3 秒"
-    tome_autocast_5: "5 秒"
-    tome_autocast_manual: "手动"
     tome_select_spell: "选择一个法术"
     tome_select_a_thang: "选择人物来 "
     tome_available_spells: "可用的法术"
     hud_continue: "继续 (按 shift-空格)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+    or: "或"
+    name: "名字"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "邮箱"
+    message: "留言"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/zh-HANT.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese (Traditional)", translation:
   common:
     loading: "Loading..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "儲存中..."
+    sending: "發送中...."
+    cancel: "退出"
+#    save: "Save"
+    delay_1_sec: "1 秒"
+    delay_3_sec: "3 秒"
+    delay_5_sec: "5 秒"
+    manual: "手動手动"
+#    fork: "Fork"
+    play: "玩"
 
   modal:
     close: "關閉"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     page_not_found: "找不到網頁"
 
   nav:
-    sign_up: "註冊"
-    log_in: "登錄"
-    log_out: "退出"
     play: "玩"
     editor: "編輯"
     blog: "博客"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     twitter_follow: "關注"
 #    employers: "Employers"
 
-  forms:
-    name: "名字"
-    email: "郵箱"
-    message: "留言"
-    cancel: "退出"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,25 +42,23 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "登錄"
     sign_up: "註冊"
-    or: "，或"
+    log_in: "登錄"
+    log_out: "退出"
     recover: "找回帳戶"
 
-#  recover:
-#    recover_account_title: "Recover Account"
+  recover:
+    recover_account_title: "復原帳戶"
 #    send_password: "Send Recovery Password"
 
   signup:
 #    create_account_title: "Create Account to Save Progress"
     description: "這是免費的。超簡單的喲："
     email_announcements: "通過郵件接收通知"
-#    coppa: "13+ or non-USA "
+    coppa: "13歲以上或非美國公民"
     coppa_why: "爲什麽？"
     creating: "帳戶創建中..."
     sign_up: "註冊"
-    or: "或"
     log_in: "登錄"
 
   home:
@@ -103,9 +98,9 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     title: "幫我們翻譯CodeCombat"
     sub_heading: "我們需要您的語言技能"
     pitch_body: "我們開發了CodeCombat的英文版，但是現在我們的玩家遍佈全球。很多人想玩中文（繁体）版的，卻不會說英文，所以如果你中英文都會，請考慮一下參加我們的翻譯工作，幫忙把 CodeCombat 網站還有所有的關卡翻譯成中文（繁体）。"
-#    missing_translations: "Until we can translate everything into {English}, you'll see English when {English} isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    missing_translations: "直至所有正體中文的翻譯完畢，當無法提供正體中文時還會以英文顯示。"
+    learn_more: "關於成為外交官"
+    subscribe_as_diplomat: "註冊成為外交官"
 
 #  wizard_settings:
 #    title: "Wizard Settings"
@@ -129,12 +124,11 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     email_subscriptions: "郵箱驗證"
     email_announcements: "通知"
     email_announcements_description: "接收關於 CodeCombat 最近的新聞和發展的郵件。"
-#    contributor_emails: "Contributor Class Emails"
+    contributor_emails: "貢獻者電郵"
     contribute_prefix: "我們在尋找志同道合的人！請到 "
     contribute_page: "貢獻頁面"
     contribute_suffix: " 查看更多信息。"
     email_toggle: "切換所有"
-    saving: "保存中..."
     error_saving: "保存時出錯"
     saved: "保存修改"
     password_mismatch: "密碼不匹配。"
@@ -152,7 +146,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     gravatar_not_found_other: "哎呦，沒有與這個人的郵箱相關的資料。"
     gravatar_contact: "聯繫"
     gravatar_websites: "網站"
-#    gravatar_accounts: "As Seen On"
+    gravatar_accounts: "顯示為"
     gravatar_profile_link: "完善 Gravatar 資料"
 
   play_level:
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     tome_cast_button_casting: "發動中"
     tome_cast_button_cast: "咒語"
     tome_autocast_delay: "自動施法延遲"
-    tome_autocast_1: "1 秒"
-    tome_autocast_3: "3 秒"
-    tome_autocast_5: "5 秒"
-    tome_autocast_manual: "手動手动"
     tome_select_spell: "選擇一個法術"
     tome_select_a_thang: "選擇人物來 "
     tome_available_spells: "可用的法術"
     hud_continue: "繼續 (按 shift-空格)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
 #  general:
 #    and: "and"
+    or: "或"
+    name: "名字"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "郵箱"
+    message: "留言"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/locale/zh.coffee

@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "中文", englishDescription: "Chinese", translation:
-#  common:
+  common:
 #    loading: "Loading..."
 #    saving: "Saving..."
-#    sending: "Sending..."
+    sending: "在发送中。。。"
+    cancel: "退出"
+#    save: "Save"
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+    play: "玩"
 
   modal:
     close: "关闭"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     page_not_found: "找不到网页"
 
   nav:
-    sign_up: "注册"
-    log_in: "登录"
-    log_out: "登出"
     play: "玩"
     editor: "编辑"
     blog: "博客"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     twitter_follow: "关注"
 #    employers: "Employers"
 
-  forms:
-    name: "名字"
-    email: "邮箱"
-    message: "留言"
-    cancel: "退出"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "登录"
     sign_up: "注册"
-    or: "或"
+    log_in: "登录"
+    log_out: "登出"
     recover: "找回账户"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     coppa_why: "为什么？"
     creating: "账户在创新中"
     sign_up: "注册"
-    or: "或"
     log_in: "以密码登录"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    forum_prefix: "For anything public, please try "
     forum_page: "我们的论坛"
 #    forum_suffix: " instead."
-    sending: "在发送中。。。"
     send: "意见反馈"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,32 +236,25 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
-
-#  level:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_description: "Description"
-#    index_table_version: "Version"
 
 #  article:
-#    index_table_results: "Results"
-#    index_table_name: "Name"
-#    index_table_body: "Body"
-#    index_table_version: "Version"
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
+    or: "或"
+    name: "名字"
+#    body: "Body"
+#    version: "Version"
+#    commit_msg: "Commit Message"
+#    version_history_for: "Version History for: "
+#    results: "Results"
+#    description: "Description"
+    email: "邮箱"
+    message: "留言"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@@ -364,6 +341,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 
 #  contribute:
 #    page_title: "Contributing"
+#    character_classes_title: "Character Classes"
 #    introduction_desc_intro: "We have high hopes for CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"

app/models/Article.coffee

@@ -3,3 +3,4 @@ CocoModel = require('./CocoModel')
 module.exports = class Article extends CocoModel
   @className: "Article"
   urlRoot: "/db/article"
+  saveBackups: true

app/models/CocoModel.coffee

@@ -1,3 +1,5 @@
+storage = require 'lib/storage'
+
 class CocoSchema extends Backbone.Model
   constructor: (path, args...) ->
     super(args...)
@@ -9,6 +11,7 @@ class CocoModel extends Backbone.Model
   idAttribute: "_id"
   loaded: false
   loading: false
+  saveBackups: false
   @schema: null
 
   initialize: ->
@@ -20,15 +23,32 @@ class CocoModel extends Backbone.Model
       @addSchemaDefaults()
     else
       @loadSchema()
-    @once 'sync', @onLoaded
+    @once 'sync', @onLoaded, @
+    @saveBackup = _.debounce(@saveBackup, 500)
     
   type: ->
     @constructor.className
 
-  onLoaded: =>
+  onLoaded: ->
     @loaded = true
     @loading = false
     @markToRevert()
+    if @saveBackups
+      existing = storage.load @id
+      if existing
+        @set(existing, {silent:true}) 
+        CocoModel.backedUp[@id] = @
+    
+  set: ->
+    res = super(arguments...)
+    @saveBackup() if @saveBackups and @loaded
+    res
+    
+  saveBackup: ->
+    storage.save(@id, @attributes)
+    CocoModel.backedUp[@id] = @
+    
+  @backedUp = {}
 
   loadSchema: ->
     unless @constructor.schema
@@ -38,7 +58,6 @@ class CocoModel extends Backbone.Model
     @constructor.schema.on 'sync', =>
       @constructor.schema.loaded = true
       @addSchemaDefaults()
-      @markToRevert()
       @trigger 'schema-loaded'
 
   @hasSchema: -> return @schema?.loaded
@@ -57,6 +76,7 @@ class CocoModel extends Backbone.Model
       @trigger "save:success", @
       success(@, resp) if success
       @markToRevert()
+      @clearBackup()
     @trigger "save", @
     return super attrs, options
 
@@ -69,6 +89,10 @@ class CocoModel extends Backbone.Model
 
   revert: ->
     @set(@_revertAttributes, {silent: true}) if @_revertAttributes
+    @clearBackup()
+    
+  clearBackup: ->
+    storage.remove @id
 
   hasLocalChanges: ->
     not _.isEqual @attributes, @_revertAttributes

app/models/SuperModel.coffee

@@ -6,6 +6,7 @@ class SuperModel
 
   populateModel: (model) ->
     @mustPopulate = model
+    model.saveBackups = @shouldSaveBackups(model)
     model.fetch() unless model.loaded or model.loading
     model.on('sync', @modelLoaded) unless model.loaded
     model.once('error', @modelErrored) unless model.loaded
@@ -13,7 +14,9 @@ class SuperModel
     @models[url] = model unless @models[url]?
     @modelLoaded(model) if model.loaded
 
-  shouldPopulate: (url) -> return true # replace or overwrite
+  # replace or overwrite
+  shouldPopulate: (url) -> return true 
+  shouldSaveBackups: (model) -> return false
 
   modelErrored: (model) =>
     @trigger 'error'
@@ -25,6 +28,7 @@ class SuperModel
     refs = [] unless @mustPopulate is model or @shouldPopulate(model)
 #    console.log 'Loaded', model.get('name')
     for ref, i in refs
+      ref.saveBackups = @shouldSaveBackups(ref)
       refURL = ref.url()
       continue if @models[refURL]
       @models[refURL] = ref

app/models/ThangType.coffee

@@ -22,12 +22,13 @@ module.exports = class ThangType extends CocoModel
   resetSpriteSheetCache: ->
     @buildActions()
     @spriteSheets = {}
+    @building = {}
 
   getActions: ->
     return @actions or @buildActions()
 
   buildActions: ->
-    @actions = _.cloneDeep(@get('actions'))
+    @actions = _.cloneDeep(@get('actions') or {})
     for name, action of @actions
       action.name = name
       for relatedName, relatedAction of action.relatedActions ? {}
@@ -90,6 +91,7 @@ module.exports = class ThangType extends CocoModel
     for animation in @requiredRawAnimations()
       name = animation.animation
       mc = @vectorParser.buildMovieClip name
+      continue unless mc
       @builder.addMovieClip mc, null, animation.scale * @options.resolutionFactor
       framesMap[animation.scale + "_" + name] = @builder._animations[name].frames
 
@@ -97,6 +99,7 @@ module.exports = class ThangType extends CocoModel
       continue if name is 'portrait'
       scale = action.scale ? @get('scale') ? 1
       frames = framesMap[scale + "_" + action.animation]
+      continue unless frames
       frames = @mapFrames(action.frames, frames[0]) if action.frames?
       next = true
       next = action.goesTo if action.goesTo
@@ -107,6 +110,7 @@ module.exports = class ThangType extends CocoModel
       continue if name is 'portrait'
       scale = @options.resolutionFactor * (action.scale or @get('scale') or 1)
       s = @vectorParser.buildContainerFromStore(action.container)
+      continue unless s
       frame = @builder.addFrame(s, s.bounds, scale)
       @builder.addAnimation name, [frame], false
 
@@ -138,10 +142,12 @@ module.exports = class ThangType extends CocoModel
     console.warn 'Building', @get('name'), 'and blocking the main thread.'
     spriteSheet = @builder.build()
     @spriteSheets[key] = spriteSheet
+    delete @building[key]
     spriteSheet
 
   onBuildSpriteSheetComplete: (e, key) ->
     @spriteSheets[key] = e.target.spriteSheet
+    delete @building[key]
     @trigger 'build-complete'
     @builder = null
     @vectorParser = null

app/styles/about.sass

@@ -3,9 +3,19 @@
   @import "bootstrap/variables"
 
   .team-column
-    margin-left: 50px
+    padding-left: 0
+
+    ul.thumbnails
+      margin-left: 40px
+      padding: 0
+
+      li
+        list-style-type: none
+        padding-bottom: 20px
+
 
     img
       float: left
       width: 150px
       height: 150px
+

app/styles/account/profile.sass

@@ -4,7 +4,7 @@
     i
       margin-right: 5px
   
-  img.img-polaroid
+  img.img-thumbnail
     margin: 20px 0
     
   li
@@ -12,3 +12,4 @@
     
   ul
     margin: 0
+    padding: 0

app/styles/account/settings.sass

@@ -1,20 +1,22 @@
 #account-settings-view
-  .nav-tabs
-    margin-bottom: 0
+  .nav
+    margin-bottom: 10px
 
   .tab-content
     border: 1px solid #aaa
-    border-top-width: 0
     padding: 20px
     background: #eee
+    border-radius: 5px
 
   #save-button
     float: right
 
   .thumbnails
     text-align: center
-    div
+    .thumbnail
       margin-bottom: 30px
+      margin-right: 20px
+      float: left
       
   input.range
     position: relative
@@ -34,6 +36,9 @@
     left: 10px
     font-size: 12px
     
+  .form
+    max-width: 600px
+    
 #wizard-settings-tab-view
   #color-settings
     float: left

app/styles/account/unsubscribe.sass

@@ -0,0 +1,8 @@
+#unsubscribe-view
+  text-align: center
+  
+  p
+    margin: 20px 0
+  
+  .progress-bar
+    width: 100%

app/styles/base.sass

@@ -4,12 +4,6 @@
 h1 h2 h3 h4
   letter-spacing: 2px
 
-#widget-bounds
-  display: none
-
-.navbar a.brand
-  padding: 4px 20px 0px 20px
-
 .main-content-area
   position: relative
   width: 1024px
@@ -18,53 +12,12 @@ h1 h2 h3 h4
   padding: 14px 12px 5px 12px
   @include box-sizing(border-box)
 
-.navbuttontext, .fancy-select .trigger
-  font-family: 'Bangers', cursive
-  font-size: 20px
-  font-weight: normal
-  letter-spacing: 1px
-
-.navbar .nav.navbar-link-text, .navbar .nav.navbar-link-text > li > a
-  font-family: 'Bangers', cursive
-  font-weight: normal
-  font-size: 25px
-  letter-spacing: 2px
-
-.navbar .btn, .navbar .btn-group, .navbar .fancy-select
-  margin-top: 13px
-  
-.nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus
-  background-color: #eee
-  
-.nav-tabs > li
-  cursor: pointer
-
 #outer-content-wrapper
   background: #8cc63f url(/images/pages/base/repeat-tile.png) top center
 
 #inner-content-wrapper
   background: url(/images/pages/base/background_texture.png) top center no-repeat
 
-.navbar-inner
-  font-size: 25px
-  a:not(.btn)
-    line-height: 25px
-
-  .btn, .fancy-select
-    float: right
-    margin-left: 10px
-
-  select
-    opacity: 0
-
-  .fancy-select
-    .trigger
-      padding: 5px 25px 3px 10px
-      width: auto
-      &:after
-        top: 13px
-      max-width: 140px
-
 #front-summary-points-left
   width: 250px
   margin: 0px 20px 10px 15px
@@ -100,6 +53,8 @@ h1 h2 h3 h4
   color: #ffffff
   cursor: pointer
   margin: 0px 10px
+  &:hover
+    color: $white
 
 a[data-toggle="modal"]
   cursor: pointer
@@ -107,13 +62,13 @@ a[data-toggle="modal"]
 .share-buttons, .partner-badges
   margin-top: 10px
   text-align: center
-  @include opacity(75)
+  @include opacity(0.75)
 
   &.fade-in
     @include opacity(0)
 
   &:hover, &:active
-    @include opacity(100)
+    @include opacity(1)
     @include transition(opacity .10s linear)
 
   .github-star-button
@@ -125,13 +80,16 @@ a[data-toggle="modal"]
 .selectable
   cursor: pointer
 
-.modal
+.modal-dialog
   padding: 5px
   background: transparent url(/images/pages/base/modal_background.png)
   background-size: 100% 100%
   border: 0
   @include box-shadow(0 0 0 #000)
 
+  .modal-content
+    @include box-shadow(none)
+  
   .modal-header
     margin: 0 14px
     padding: 8px 0
@@ -139,9 +97,9 @@ a[data-toggle="modal"]
 
     .close
       font-size: 28px
-      @include opacity(60)
+      @include opacity(0.60)
       &:hover
-        @include opacity(100)
+        @include opacity(1)
 
   .modal-footer
     background-color: transparent
@@ -187,7 +145,7 @@ a[data-toggle="modal"]
   .progress
     width: 50%
     margin: 0 25%
-  .bar
+  .progress-bar
     width: 100%
   
 .modal
@@ -197,44 +155,15 @@ a[data-toggle="modal"]
     .progress
       width: 50%
       margin: 10px auto
-    .bar
+    .progress-bar
       width: 100%
 
 table.table
   background-color: white
 
-.ui-autocomplete
-  z-index: $zindexAutocomplete
+//.ui-autocomplete
+//  z-index: $zindexAutocomplete
   
-div.fancy-select
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25)
-  div.trigger
-    background-color: #9d8f5a
-    background-image: linear-gradient(to bottom, #a4955e, #948754)
-    background-repeat: repeat-x
-    border: 1px solid #cccccc
-    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25)
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)
-    color: white
-    &:after
-      border-top-color: white
-    &.open
-      background-color: #8B7F51
-      color: #ebebeb
-      &:after
-        border-top-color: #ebebeb
-  ul.options
-    max-height: 415px
-    background-color: #9d8f5a
-    right: 0
-    left: auto
-    overflow-x: hidden
-    &.open
-      top: 36px
-    li
-      color: #ebebeb
-      padding: 8px 20px
-
 .ui-slider
   border: 1px solid black
 .ui-slider-handle

app/styles/bootstrap-responsive.scss

@@ -1,48 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-
-// Responsive
-// For phone and tablet devices
-// -------------------------------------------------------------
-
-
-// REPEAT VARIABLES & MIXINS
-// -------------------------
-// Required since we compile the responsive stuff separately
-
-@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
-@import "bootstrap/mixins";
-
-
-// RESPONSIVE CLASSES
-// ------------------
-
-@import "bootstrap/responsive-utilities";
-
-
-// MEDIA QUERIES
-// ------------------
-
-// Large desktops
-@import "bootstrap/responsive-1200px-min";
-
-// Tablets to regular desktops
-@import "bootstrap/responsive-768px-979px";
-
-// Phones to portrait tablets and narrow desktops
-@import "bootstrap/responsive-767px-max";
-
-
-// RESPONSIVE NAVBAR
-// ------------------
-
-// From 979px and below, show a button to toggle navbar contents
-@import "bootstrap/responsive-navbar";

app/styles/bootstrap.scss

@@ -1,66 +1 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-// Core variables and mixins
-@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
-@import "bootstrap/mixins";
-
-// CSS Reset
-@import "bootstrap/reset";
-
-// Grid system and page structure
-@import "bootstrap/scaffolding";
-@import "bootstrap/grid";
-@import "bootstrap/layouts";
-
-// Base CSS
-@import "bootstrap/type";
-@import "bootstrap/code";
-@import "bootstrap/forms";
-@import "bootstrap/tables";
-
-// Components: common
-@import "bootstrap/sprites";
-@import "bootstrap/dropdowns";
-@import "bootstrap/wells";
-@import "bootstrap/component-animations";
-@import "bootstrap/close";
-
-// Components: Buttons & Alerts
-@import "bootstrap/buttons";
-@import "bootstrap/button-groups";
-@import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in _buttons.scss
-
-// Components: Nav
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-
-// Components: Popovers
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-@import "bootstrap/popovers";
-
-// Components: Misc
-@import "bootstrap/thumbnails";
-@import "bootstrap/media";
-@import "bootstrap/labels-badges";
-@import "bootstrap/progress-bars";
-@import "bootstrap/accordion";
-@import "bootstrap/carousel";
-@import "bootstrap/hero-unit";
-
-// Addition: Bootswatch structural changes
-@import "bootstrap/bootswatch";
-
-// Utility classes
-@import "bootstrap/utilities"; // Has to be last to override when necessary
+@import "bootstrap/bootstrap";

app/styles/bootstrap/_alerts.scss

@@ -7,73 +7,61 @@
 // -------------------------
 
 .alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: $baseLineHeight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  background-color: $warningBackground;
-  border: 1px solid $warningBorder;
-  @include border-radius($baseBorderRadius);
-}
-.alert,
-.alert h4 {
-  // Specified for the h4 to prevent conflicts of changing $headingsColor
-  color: $warningText;
-}
-.alert h4 {
-  margin: 0;
+  padding: $alert-padding;
+  margin-bottom: $line-height-computed;
+  border: 1px solid transparent;
+  border-radius: $alert-border-radius;
+
+  // Headings for larger alerts
+  h4 {
+    margin-top: 0;
+    // Specified for the h4 to prevent conflicts of changing $headings-color
+    color: inherit;
+  }
+  // Provide class for links that match alerts
+  .alert-link {
+    font-weight: $alert-link-font-weight;
+  }
+
+  // Improve alignment and spacing of inner content
+  > p,
+  > ul {
+    margin-bottom: 0;
+  }
+  > p + p {
+    margin-top: 5px;
+  }
 }
 
-// Adjust close link position
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: $baseLineHeight;
-}
+// Dismissable alerts
+//
+// Expand the right padding and account for the close button's positioning.
 
+.alert-dismissable {
+ padding-right: ($alert-padding + 20);
+
+  // Adjust close link position
+  .close {
+    position: relative;
+    top: -2px;
+    right: -21px;
+    color: inherit;
+  }
+}
 
 // Alternate styles
-// -------------------------
+//
+// Generate contextual modifier classes for colorizing the alert.
 
 .alert-success {
-  background-color: $successBackground;
-  border-color: $successBorder;
-  color: $successText;
-}
-.alert-success h4 {
-  color: $successText;
-}
-.alert-danger,
-.alert-error {
-  background-color: $errorBackground;
-  border-color: $errorBorder;
-  color: $errorText;
-}
-.alert-danger h4,
-.alert-error h4 {
-  color: $errorText;
+  @include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text);
 }
 .alert-info {
-  background-color: $infoBackground;
-  border-color: $infoBorder;
-  color: $infoText;
+  @include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text);
 }
-.alert-info h4 {
-  color: $infoText;
+.alert-warning {
+  @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text);
 }
-
-
-// Block alerts
-// -------------------------
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
+.alert-danger {
+  @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
 }

app/styles/bootstrap/_badges.scss

@@ -0,0 +1,51 @@
+//
+// Badges
+// --------------------------------------------------
+
+
+// Base classes
+.badge {
+  display: inline-block;
+  min-width: 10px;
+  padding: 3px 7px;
+  font-size: $font-size-small;
+  font-weight: $badge-font-weight;
+  color: $badge-color;
+  line-height: $badge-line-height;
+  vertical-align: baseline;
+  white-space: nowrap;
+  text-align: center;
+  background-color: $badge-bg;
+  border-radius: $badge-border-radius;
+
+  // Empty badges collapse automatically (not available in IE8)
+  &:empty {
+    display: none;
+  }
+
+  // Quick fix for badges in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
+}
+
+// Hover state, but only for links
+a.badge {
+  &:hover,
+  &:focus {
+    color: $badge-link-hover-color;
+    text-decoration: none;
+    cursor: pointer;
+  }
+}
+
+// Account for counters in navs
+a.list-group-item.active > .badge,
+.nav-pills > .active > a > .badge {
+  color: $badge-active-color;
+  background-color: $badge-active-bg;
+}
+.nav-pills > li > a > .badge {
+  margin-left: 3px;
+}

app/styles/bootstrap/_bootswatch.scss

@@ -14,11 +14,11 @@
 // NAVBAR
 // -----------------------------------------------------
 
-.navbar {
+.navbar {  
 
   .brand {
     padding: 14px 20px 16px;
-    font-family: $headingsFontFamily;
+    font-family: $headings-font-family;
     text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
   }
 
@@ -28,12 +28,12 @@
 
   .nav > li > a {
     padding: 16px 10px 14px;
-    font-family: $headingsFontFamily;
+    font-family: $headings-font-family;
     text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
   }
 
   .search-query {
-    border: 1px solid darken($linkColor, 10%);
+    border: 1px solid darken($link-color, 10%);
     line-height: normal;
   }
 
@@ -49,23 +49,22 @@
 .navbar-inverse {
 
   .navbar-search .search-query {
-    color: $textColor;
+    color: $text-color;
   }
 }
 
-@media (max-width: $navbarCollapseWidth) {
+@media (max-width: $grid-float-breakpoint) {
 
   .navbar .nav-collapse {
 
-    .nav li > a {
+    .navbar-nav li > a {
 
-      font-family: $headingsFontFamily;
+      font-family: $headings-font-family;
       font-weight: normal;
       color: $white;
       text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
 
       &:hover {
-        background-color: #2B7CAC;
       }
     }
 
@@ -93,7 +92,7 @@
   .navbar-inverse .nav-collapse {
 
     .nav li > a {
-      color: $navbarInverseLinkColor;
+      color: $navbar-inverse-color;
 
       &:hover {
         background-color: rgba(0, 0, 0, 0.1);
@@ -110,13 +109,13 @@
 
 div.subnav {
 
-  font-family: $headingsFontFamily;
+  font-family: $headings-font-family;
   text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.2);
 
 }
 
 div.subnav-fixed {
-  top: $navbarHeight + 1;
+  top: $navbar-height + 1;
 }
 
 
@@ -136,28 +135,30 @@ div.subnav-fixed {
   }
 }
 
+//The following were oring buttonBackground
+
 .btn-primary {
-  @include buttonBackground(lighten($btnPrimaryBackground, 5%), $btnPrimaryBackground);
+  @include button-background(lighten($btn-primary-bg, 5%), $btn-primary-bg);
 }
 
 .btn-info {
-  @include buttonBackground(lighten($btnInfoBackground, 5%), $btnInfoBackground);
+  @include button-background(lighten($btn-info-bg, 5%), $btn-info-bg);
 }
 
 .btn-success {
-  @include buttonBackground(lighten($btnSuccessBackground, 5%), $btnSuccessBackground);
+  @include button-background(lighten($btn-success-bg, 5%), $btn-success-bg);
 }
 
 .btn-warning {
-  @include buttonBackground(lighten($btnWarningBackground, 5%), $btnWarningBackground);
+  @include button-background(lighten($btn-warning-bg, 5%), $btn-warning-bg);
 }
 
 .btn-danger {
-  @include buttonBackground(lighten($btnDangerBackground, 5%), $btnDangerBackground);
+  @include button-background(lighten($btn-danger-bg, 5%), $btn-danger-bg);
 }
 
 .btn-inverse {
-  @include buttonBackground(lighten($btnInverseBackground, 5%), $btnInverseBackground);
+  @include button-background(lighten($btn-default-color, 5%), $btn-default-color);//this should be btn-inverse but I can't find it at the moment
 }
 
 // TABLES

app/styles/bootstrap/_breadcrumbs.scss

@@ -5,20 +5,19 @@
 
 .breadcrumb {
   padding: 8px 15px;
-  margin: 0 0 $baseLineHeight;
+  margin-bottom: $line-height-computed;
   list-style: none;
-  background-color: #f5f5f5;
-  @include border-radius($baseBorderRadius);
+  background-color: $breadcrumb-bg;
+  border-radius: $border-radius-base;
   > li {
     display: inline-block;
-    @include ie7-inline-block();
-    text-shadow: 0 1px 0 $white;
-    > .divider {
+    + li:before {
+      content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
-      color: #ccc;
+      color: $breadcrumb-color;
     }
   }
-  .active {
-    color: $grayLight;
+  > .active {
+    color: $breadcrumb-active-color;
   }
 }

app/styles/bootstrap/_button-groups.scss

@@ -2,90 +2,88 @@
 // Button groups
 // --------------------------------------------------
 
-
 // Make the div behave like a button
-.btn-group {
+.btn-group,
+.btn-group-vertical {
   position: relative;
   display: inline-block;
-  @include ie7-inline-block();
-  font-size: 0; // remove as part 1 of font-size inline-block hack
   vertical-align: middle; // match .btn alignment given font-size hack above
-  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
-  @include ie7-restore-left-whitespace();
+  > .btn {
+    position: relative;
+    float: left;
+    // Bring the "active" button to the front
+    &:hover,
+    &:focus,
+    &:active,
+    &.active {
+      z-index: 2;
+    }
+    &:focus {
+      // Remove focus outline when dropdown JS adds it after closing the menu
+      outline: none;
+    }
+  }
 }
 
-// Space out series of button groups
-.btn-group + .btn-group {
-  margin-left: 5px;
+// Prevent double borders when buttons are next to each other
+.btn-group {
+  .btn + .btn,
+  .btn + .btn-group,
+  .btn-group + .btn,
+  .btn-group + .btn-group {
+    margin-left: -1px;
+  }
 }
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
-  font-size: 0; // Hack to remove whitespace that results from using inline-block
-  margin-top: $baseLineHeight / 2;
-  margin-bottom: $baseLineHeight / 2;
-  > .btn + .btn,
-  > .btn-group + .btn,
-  > .btn + .btn-group {
-    margin-left: 5px;
+  @include clearfix();
+
+  .btn-group {
+    float: left;
+  }
+  // Space out series of button groups
+  > .btn,
+  > .btn-group {
+    + .btn,
+    + .btn-group {
+      margin-left: 5px;
+    }
   }
 }
 
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
-  @include border-radius(0);
-}
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-.btn-group > .btn,
-.btn-group > .dropdown-menu,
-.btn-group > .popover {
-  font-size: $baseFontSize; // redeclare as part 2 of font-size inline-block hack
-}
-
-// Reset fonts for other sizes
-.btn-group > .btn-mini {
-  font-size: $fontSizeMini;
-}
-.btn-group > .btn-small {
-  font-size: $fontSizeSmall;
-}
-.btn-group > .btn-large {
-  font-size: $fontSizeLarge;
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+  border-radius: 0;
 }
 
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
   margin-left: 0;
-  @include border-top-left-radius($baseBorderRadius);
-  @include border-bottom-left-radius($baseBorderRadius);
+  &:not(:last-child):not(.dropdown-toggle) {
+    @include border-right-radius(0);
+  }
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  @include border-top-right-radius($baseBorderRadius);
-  @include border-bottom-right-radius($baseBorderRadius);
-}
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  @include border-top-left-radius($borderRadiusLarge);
-  @include border-bottom-left-radius($borderRadiusLarge);
-}
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  @include border-top-right-radius($borderRadiusLarge);
-  @include border-bottom-right-radius($borderRadiusLarge);
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+  @include border-left-radius(0);
 }
 
-// On hover/focus/active, bring the proper btn to front
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
+// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)
+.btn-group > .btn-group {
+  float: left;
+}
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group > .btn-group:first-child {
+  > .btn:last-child,
+  > .dropdown-toggle {
+    @include border-right-radius(0);
+  }
+}
+.btn-group > .btn-group:last-child > .btn:first-child {
+  @include border-left-radius(0);
 }
 
 // On active and open, don't show outline
@@ -95,6 +93,14 @@
 }
 
 
+// Sizing
+//
+// Remix the default button sizing classes into new ones for easier manipulation.
+
+.btn-group-xs > .btn { @extend .btn-xs; }
+.btn-group-sm > .btn { @extend .btn-sm; }
+.btn-group-lg > .btn { @extend .btn-lg; }
+
 
 // Split button dropdowns
 // ----------------------
@@ -103,127 +109,119 @@
 .btn-group > .btn + .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  @include box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
-  *padding-top: 5px;
-  *padding-bottom: 5px;
 }
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-  *padding-top: 2px;
-  *padding-bottom: 2px;
-}
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
-}
-.btn-group > .btn-large + .dropdown-toggle {
+.btn-group > .btn-lg + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px;
-  *padding-top: 7px;
-  *padding-bottom: 7px;
 }
 
-.btn-group.open {
+// The clickable button for toggling the menu
+// Remove the gradient and set the same inset shadow as the :active state
+.btn-group.open .dropdown-toggle {
+  @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
 
-  // The clickable button for toggling the menu
-  // Remove the gradient and set the same inset shadow as the :active state
-  .dropdown-toggle {
-    background-image: none;
-    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
-  }
-
-  // Keep the hover's background when dropdown is open
-  .btn.dropdown-toggle {
-    background-color: $btnBackgroundHighlight;
-  }
-  .btn-primary.dropdown-toggle {
-    background-color: $btnPrimaryBackgroundHighlight;
-  }
-  .btn-warning.dropdown-toggle {
-    background-color: $btnWarningBackgroundHighlight;
-  }
-  .btn-danger.dropdown-toggle {
-    background-color: $btnDangerBackgroundHighlight;
-  }
-  .btn-success.dropdown-toggle {
-    background-color: $btnSuccessBackgroundHighlight;
-  }
-  .btn-info.dropdown-toggle {
-    background-color: $btnInfoBackgroundHighlight;
-  }
-  .btn-inverse.dropdown-toggle {
-    background-color: $btnInverseBackgroundHighlight;
+  // Show no shadow for `.btn-link` since it has no other button styles.
+  &.btn-link {
+    @include box-shadow(none);
   }
 }
 
 
 // Reposition the caret
 .btn .caret {
-  margin-top: 8px;
   margin-left: 0;
 }
 // Carets in other button sizes
-.btn-large .caret {
-  margin-top: 6px;
-}
-.btn-large .caret {
-  border-left-width:  5px;
-  border-right-width: 5px;
-  border-top-width:   5px;
-}
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
+.btn-lg .caret {
+  border-width: $caret-width-large $caret-width-large 0;
+  border-bottom-width: 0;
 }
 // Upside down carets for .dropup
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
+.dropup .btn-lg .caret {
+  border-width: 0 $caret-width-large $caret-width-large;
 }
 
 
-
-// Account for other colors
-.btn-primary,
-.btn-warning,
-.btn-danger,
-.btn-info,
-.btn-success,
-.btn-inverse {
-  .caret {
-    border-top-color: $white;
-    border-bottom-color: $white;
-  }
-}
-
-
-
 // Vertical button groups
 // ----------------------
 
 .btn-group-vertical {
-  display: inline-block; // makes buttons only take up the width they need
-  @include ie7-inline-block();
+  > .btn,
+  > .btn-group,
+  > .btn-group > .btn {
+    display: block;
+    float: none;
+    width: 100%;
+    max-width: 100%;
+  }
+
+  // Clear floats so dropdown menus can be properly placed
+  > .btn-group {
+    @include clearfix();
+    > .btn {
+      float: none;
+    }
+  }
+
+  > .btn + .btn,
+  > .btn + .btn-group,
+  > .btn-group + .btn,
+  > .btn-group + .btn-group {
+    margin-top: -1px;
+    margin-left: 0;
+  }
 }
+
 .btn-group-vertical > .btn {
-  display: block;
-  float: none;
-  max-width: 100%;
-  @include border-radius(0);
+  &:not(:first-child):not(:last-child) {
+    border-radius: 0;
+  }
+  &:first-child:not(:last-child) {
+    border-top-right-radius: $border-radius-base;
+    @include border-bottom-radius(0);
+  }
+  &:last-child:not(:first-child) {
+    border-bottom-left-radius: $border-radius-base;
+    @include border-top-radius(0);
+  }
 }
-.btn-group-vertical > .btn + .btn {
-  margin-left: 0;
-  margin-top: -1px;
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
 }
-.btn-group-vertical > .btn:first-child {
-  @include border-radius($baseBorderRadius $baseBorderRadius 0 0);
+.btn-group-vertical > .btn-group:first-child {
+  > .btn:last-child,
+  > .dropdown-toggle {
+    @include border-bottom-radius(0);
+  }
 }
-.btn-group-vertical > .btn:last-child {
-  @include border-radius(0 0 $baseBorderRadius $baseBorderRadius);
+.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+  @include border-top-radius(0);
 }
-.btn-group-vertical > .btn-large:first-child {
-  @include border-radius($borderRadiusLarge $borderRadiusLarge 0 0);
+
+
+
+// Justified button groups
+// ----------------------
+
+.btn-group-justified {
+  display: table;
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: separate;
+  > .btn,
+  > .btn-group {
+    float: none;
+    display: table-cell;
+    width: 1%;
+  }
+  > .btn-group .btn {
+    width: 100%;
+  }
 }
-.btn-group-vertical > .btn-large:last-child {
-  @include border-radius(0 0 $borderRadiusLarge $borderRadiusLarge);
+
+
+// Checkbox and radio options
+[data-toggle="buttons"] > .btn > input[type="radio"],
+[data-toggle="buttons"] > .btn > input[type="checkbox"] {
+  display: none;
 }

app/styles/bootstrap/_buttons.scss

@@ -6,109 +6,138 @@
 // Base styles
 // --------------------------------------------------
 
-// Core
 .btn {
   display: inline-block;
-  @include ie7-inline-block();
-  padding: 4px 12px;
   margin-bottom: 0; // For input.btn
-  font-size: $baseFontSize;
-  line-height: $baseLineHeight;
+  font-weight: $btn-font-weight;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  @include buttonBackground($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75));
-  border: 1px solid $btnBorder;
-  *border: 0; // Remove the border to prevent IE7's black border on input:focus
-  border-bottom-color: darken($btnBorder, 10%);
-  @include border-radius($baseBorderRadius);
-  @include ie7-restore-left-whitespace(); // Give IE7 some love
-  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
+  border: 1px solid transparent;
+  white-space: nowrap;
+  @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
+  @include user-select(none);
 
-  // Hover/focus state
-  &:hover,
-  &:focus {
-    color: $grayDark;
-    text-decoration: none;
-    background-position: 0 -15px;
-
-    // transition is only when going to hover/focus, otherwise the background
-    // behind the gradient (there for IE<=9 fallback) gets mismatched
-    @include transition(background-position .1s linear);
-  }
-
-  // Focus state for keyboard and accessibility
   &:focus {
     @include tab-focus();
   }
 
-  // Active state
-  &.active,
-  &:active {
-    background-image: none;
-    outline: 0;
-    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
+  &:hover,
+  &:focus {
+    color: $btn-default-color;
+    text-decoration: none;
   }
 
-  // Disabled state
-  &.disabled,
-  &[disabled] {
-    cursor: default;
+  &:active,
+  &.active {
+    outline: 0;
     background-image: none;
-    @include opacity(65);
+    @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+  }
+
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+    pointer-events: none; // Future-proof disabling of clicks
+    @include opacity(.65);
     @include box-shadow(none);
   }
-
 }
 
 
+// Alternate buttons
+// --------------------------------------------------
+
+.btn-default {
+  @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
+}
+.btn-primary {
+  @include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
+}
+// Warning appears as orange
+.btn-warning {
+  @include button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border);
+}
+// Danger and error appear as red
+.btn-danger {
+  @include button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border);
+}
+// Success appears as green
+.btn-success {
+  @include button-variant($btn-success-color, $btn-success-bg, $btn-success-border);
+}
+// Info appears as blue-green
+.btn-info {
+  @include button-variant($btn-info-color, $btn-info-bg, $btn-info-border);
+}
+
+
+// Link buttons
+// -------------------------
+
+// Make a button look and behave like a link
+.btn-link {
+  color: $link-color;
+  font-weight: normal;
+  cursor: pointer;
+  border-radius: 0;
+
+  &,
+  &:active,
+  &[disabled],
+  fieldset[disabled] & {
+    background-color: transparent;
+    @include box-shadow(none);
+  }
+  &,
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: transparent;
+  }
+  &:hover,
+  &:focus {
+    color: $link-hover-color;
+    text-decoration: underline;
+    background-color: transparent;
+  }
+  &[disabled],
+  fieldset[disabled] & {
+    &:hover,
+    &:focus {
+      color: $btn-link-disabled-color;
+      text-decoration: none;
+    }
+  }
+}
+
 
 // Button Sizes
 // --------------------------------------------------
 
-// Large
-.btn-large {
-  padding: $paddingLarge;
-  font-size: $fontSizeLarge;
-  @include border-radius($borderRadiusLarge);
+.btn-lg {
+  // line-height: ensure even-numbered height of button next to large input
+  @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
 }
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 4px;
+.btn-sm {
+  // line-height: ensure proper height of button next to small input
+  @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 }
-
-// Small
-.btn-small {
-  padding: $paddingSmall;
-  font-size: $fontSizeSmall;
-  @include border-radius($borderRadiusSmall);
-}
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
-
-// Mini
-.btn-mini {
-  padding: $paddingMini;
-  font-size: $fontSizeMini;
-  @include border-radius($borderRadiusSmall);
+.btn-xs {
+  @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 }
 
 
 // Block button
-// -------------------------
+// --------------------------------------------------
 
 .btn-block {
   display: block;
   width: 100%;
   padding-left: 0;
   padding-right: 0;
-  @include box-sizing(border-box);
 }
 
 // Vertically space out multiple block buttons
@@ -124,105 +153,3 @@ input[type="button"] {
     width: 100%;
   }
 }
-
-
-
-// Alternate buttons
-// --------------------------------------------------
-
-// Provide *some* extra contrast for those who can get it
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255,255,255,.75);
-}
-
-// Set the backgrounds
-// -------------------------
-.btn-primary {
-  @include buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
-}
-// Warning appears are orange
-.btn-warning {
-  @include buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
-}
-// Danger and error appear as red
-.btn-danger {
-  @include buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
-}
-// Success appears as green
-.btn-success {
-  @include buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
-}
-// Info appears as a neutral blue
-.btn-info {
-  @include buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
-}
-// Inverse appears as dark gray
-.btn-inverse {
-  @include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
-}
-
-
-// Cross-browser Jank
-// --------------------------------------------------
-
-button.btn,
-input[type="submit"].btn {
-
-  // Firefox 3.6 only I believe
-  &::-moz-focus-inner {
-    padding: 0;
-    border: 0;
-  }
-
-  // IE7 has some default padding on button controls
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-
-  &.btn-large {
-    *padding-top: 7px;
-    *padding-bottom: 7px;
-  }
-  &.btn-small {
-    *padding-top: 3px;
-    *padding-bottom: 3px;
-  }
-  &.btn-mini {
-    *padding-top: 1px;
-    *padding-bottom: 1px;
-  }
-}
-
-
-// Link buttons
-// --------------------------------------------------
-
-// Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  @include box-shadow(none);
-}
-.btn-link {
-  border-color: transparent;
-  cursor: pointer;
-  color: $linkColor;
-  @include border-radius(0);
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: $linkColorHover;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link[disabled]:hover,
-.btn-link[disabled]:focus {
-  color: $grayDark;
-  text-decoration: none;
-}

app/styles/bootstrap/_carousel.scss

@@ -3,29 +3,25 @@
 // --------------------------------------------------
 
 
+// Wrapper for the slide container and indicators
 .carousel {
   position: relative;
-  margin-bottom: $baseLineHeight;
-  line-height: 1;
 }
 
 .carousel-inner {
+  position: relative;
   overflow: hidden;
   width: 100%;
-  position: relative;
-}
-
-.carousel-inner {
 
   > .item {
     display: none;
     position: relative;
     @include transition(.6s ease-in-out left);
 
-  // Account for jankitude on images
+    // Account for jankitude on images
     > img,
     > a > img {
-      display: block;
+      @include img-responsive();
       line-height: 1;
     }
   }
@@ -70,89 +66,167 @@
 
 .carousel-control {
   position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: $white;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: $carousel-control-width;
+  @include opacity($carousel-control-opacity);
+  font-size: $carousel-control-font-size;
+  color: $carousel-control-color;
   text-align: center;
-  background: $grayDarker;
-  border: 3px solid $white;
-  @include border-radius(23px);
-  @include opacity(50);
+  text-shadow: $carousel-text-shadow;
+  // We can't have this transition here because WebKit cancels the carousel
+  // animation if you trip this while in the middle of another animation.
 
-  // we can't have this transition here
-  // because webkit cancels the carousel
-  // animation if you trip this while
-  // in the middle of another animation
-  // ;_;
-  // .transition(opacity .2s linear);
-
-  // Reposition the right one
+  // Set gradients for backgrounds
+  &.left {
+    @include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001));
+  }
   &.right {
     left: auto;
-    right: 15px;
+    right: 0;
+    @include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5));
   }
 
   // Hover/focus state
   &:hover,
   &:focus {
-    color: $white;
+    outline: none;
+    color: $carousel-control-color;
     text-decoration: none;
-    @include opacity(90);
+    @include opacity(.9);
+  }
+
+  // Toggles
+  .icon-prev,
+  .icon-next,
+  .glyphicon-chevron-left,
+  .glyphicon-chevron-right {
+    position: absolute;
+    top: 50%;
+    z-index: 5;
+    display: inline-block;
+  }
+  .icon-prev,
+  .glyphicon-chevron-left {
+    left: 50%;
+  }
+  .icon-next,
+  .glyphicon-chevron-right {
+    right: 50%;
+  }
+  .icon-prev,
+  .icon-next {
+    width:  20px;
+    height: 20px;
+    margin-top: -10px;
+    margin-left: -10px;
+    font-family: serif;
+  }
+
+  .icon-prev {
+    &:before {
+      content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
+    }
+  }
+  .icon-next {
+    &:before {
+      content: '\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
+    }
   }
 }
 
-// Carousel indicator pips
-// -----------------------------
+// Optional indicator pips
+//
+// Add an unordered list with the following class and add a list item for each
+// slide your carousel holds.
+
 .carousel-indicators {
   position: absolute;
-  top: 15px;
-  right: 15px;
-  z-index: 5;
-  margin: 0;
+  bottom: 10px;
+  left: 50%;
+  z-index: 15;
+  width: 60%;
+  margin-left: -30%;
+  padding-left: 0;
   list-style: none;
+  text-align: center;
 
   li {
-    display: block;
-    float: left;
-    width: 10px;
+    display: inline-block;
+    width:  10px;
     height: 10px;
-    margin-left: 5px;
+    margin: 1px;
     text-indent: -999px;
-    background-color: #ccc;
-    background-color: rgba(255,255,255,.25);
-    border-radius: 5px;
+    border: 1px solid $carousel-indicator-border-color;
+    border-radius: 10px;
+    cursor: pointer;
+
+    // IE8-9 hack for event handling
+    //
+    // Internet Explorer 8-9 does not support clicks on elements without a set
+    // `background-color`. We cannot use `filter` since that's not viewed as a
+    // background color by the browser. Thus, a hack is needed.
+    //
+    // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
+    // set alpha transparency for the best results possible.
+    background-color: #000 \9; // IE8
+    background-color: rgba(0,0,0,0); // IE9
   }
   .active {
-    background-color: #fff;
+    margin: 0;
+    width:  12px;
+    height: 12px;
+    background-color: $carousel-indicator-active-bg;
   }
 }
 
-// Caption for text below images
+// Optional captions
 // -----------------------------
-
+// Hidden by default for smaller viewports
 .carousel-caption {
   position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 15px;
-  background: $grayDark;
-  background: rgba(0,0,0,.75);
+  left: 15%;
+  right: 15%;
+  bottom: 20px;
+  z-index: 10;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  color: $carousel-caption-color;
+  text-align: center;
+  text-shadow: $carousel-text-shadow;
+  & .btn {
+    text-shadow: none; // No shadow for button elements in carousel-caption
+  }
 }
-.carousel-caption h4,
-.carousel-caption p {
-  color: $white;
-  line-height: $baseLineHeight;
-}
-.carousel-caption h4 {
-  margin: 0 0 5px;
-}
-.carousel-caption p {
-  margin-bottom: 0;
+
+
+// Scale up controls for tablets and up
+@media screen and (min-width: $screen-sm-min) {
+
+  // Scale up the controls a smidge
+  .carousel-control {
+    .glyphicons-chevron-left,
+    .glyphicons-chevron-right,
+    .icon-prev,
+    .icon-next {
+      width: 30px;
+      height: 30px;
+      margin-top: -15px;
+      margin-left: -15px;
+      font-size: 30px;
+    }
+  }
+
+  // Show and left align the captions
+  .carousel-caption {
+    left: 20%;
+    right: 20%;
+    padding-bottom: 30px;
+  }
+
+  // Move up the indicators
+  .carousel-indicators {
+    bottom: 20px;
+  }
 }

app/styles/bootstrap/_close.scss

@@ -5,19 +5,22 @@
 
 .close {
   float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: $baseLineHeight;
-  color: $black;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
-  @include opacity(20);
+  font-size: ($font-size-base * 1.5);
+  font-weight: $close-font-weight;
+  line-height: 1;
+  color: $close-color;
+  text-shadow: $close-text-shadow;
+  @include opacity(.2);
+
   &:hover,
   &:focus {
-    color: $black;
+    color: $close-color;
     text-decoration: none;
     cursor: pointer;
-    @include opacity(40);
+    @include opacity(.5);
   }
+
+  // [converter] extracted button& to button.close
 }
 
 // Additional properties for button version

app/styles/bootstrap/_code.scss

@@ -1,61 +1,53 @@
 //
-// Code (inline and blocK)
+// Code (inline and block)
 // --------------------------------------------------
 
 
 // Inline and block code styles
 code,
-pre {
-  padding: 0 3px 2px;
-  @include font-family-monospace;
-  font-size: $baseFontSize - 2;
-  color: $grayDark;
-  @include border-radius(3px);
+kbd,
+pre,
+samp {
+  font-family: $font-family-monospace;
 }
 
 // Inline code
 code {
   padding: 2px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
+  font-size: 90%;
+  color: $code-color;
+  background-color: $code-bg;
   white-space: nowrap;
+  border-radius: $border-radius-base;
 }
 
 // Blocks of code
 pre {
   display: block;
-  padding: ($baseLineHeight - 1) / 2;
-  margin: 0 0 $baseLineHeight / 2;
-  font-size: $baseFontSize - 1; // 14px to 13px
-  line-height: $baseLineHeight;
+  padding: (($line-height-computed - 1) / 2);
+  margin: 0 0 ($line-height-computed / 2);
+  font-size: ($font-size-base - 1); // 14px to 13px
+  line-height: $line-height-base;
   word-break: break-all;
   word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // fallback for IE7-8
-  border: 1px solid rgba(0,0,0,.15);
-  @include border-radius($baseBorderRadius);
-
-  // Make prettyprint styles more spaced out for readability
-  &.prettyprint {
-    margin-bottom: $baseLineHeight;
-  }
+  color: $pre-color;
+  background-color: $pre-bg;
+  border: 1px solid $pre-border-color;
+  border-radius: $border-radius-base;
 
   // Account for some code outputs that place code tags in pre tags
   code {
     padding: 0;
+    font-size: inherit;
     color: inherit;
-    white-space: pre;
     white-space: pre-wrap;
     background-color: transparent;
-    border: 0;
+    border-radius: 0;
   }
 }
 
 // Enable scrollable blocks of code
 .pre-scrollable {
-  max-height: 340px;
+  max-height: $pre-scrollable-max-height;
   overflow-y: scroll;
 }

app/styles/bootstrap/_component-animations.scss

@@ -2,6 +2,10 @@
 // Component animations
 // --------------------------------------------------
 
+// Heads up!
+//
+// We don't use the `.opacity()` mixin here since it causes a bug with text
+// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
 
 .fade {
   opacity: 0;
@@ -12,11 +16,14 @@
 }
 
 .collapse {
+  display: none;
+  &.in {
+    display: block;
+  }
+}
+.collapsing {
   position: relative;
   height: 0;
   overflow: hidden;
   @include transition(height .35s ease);
-  &.in {
-    height: auto;
-  }
 }

app/styles/bootstrap/_dropdowns.scss

@@ -3,62 +3,47 @@
 // --------------------------------------------------
 
 
-// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
-.dropup,
-.dropdown {
-  position: relative;
-}
-.dropdown-toggle {
-  // The caret makes the toggle a bit too tall in IE7
-  *margin-bottom: -3px;
-}
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
 // Dropdown arrow/caret
-// --------------------
 .caret {
   display: inline-block;
   width: 0;
   height: 0;
-  vertical-align: top;
-  border-top:   4px solid $black;
-  border-right: 4px solid transparent;
-  border-left:  4px solid transparent;
-  content: "";
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top:   $caret-width-base solid;
+  border-right: $caret-width-base solid transparent;
+  border-left:  $caret-width-base solid transparent;
 }
 
-// Place the caret
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
+// The dropdown wrapper (div)
+.dropdown {
+  position: relative;
+}
+
+// Prevent the focus on the dropdown toggle when closing dropdowns
+.dropdown-toggle:focus {
+  outline: 0;
 }
 
 // The dropdown menu (ul)
-// ----------------------
 .dropdown-menu {
   position: absolute;
   top: 100%;
   left: 0;
-  z-index: $zindexDropdown;
+  z-index: $zindex-dropdown;
   display: none; // none by default, but block on "open" of the menu
   float: left;
   min-width: 160px;
   padding: 5px 0;
   margin: 2px 0 0; // override default ul
   list-style: none;
-  background-color: $dropdownBackground;
-  border: 1px solid #ccc; // Fallback for IE7-8
-  border: 1px solid $dropdownBorder;
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  @include border-radius(6px);
-  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
+  font-size: $font-size-base;
+  background-color: $dropdown-bg;
+  border: 1px solid $dropdown-fallback-border; // IE8 fallback
+  border: 1px solid $dropdown-border;
+  border-radius: $border-radius-base;
+  @include box-shadow(0 6px 12px rgba(0,0,0,.175));
+  background-clip: padding-box;
 
   // Aligns the dropdown menu to right
   &.pull-right {
@@ -68,7 +53,7 @@
 
   // Dividers (basically an hr) within the dropdown
   .divider {
-    @include nav-divider($dropdownDividerTop, $dropdownDividerBottom);
+    @include nav-divider($dropdown-divider-bg);
   }
 
   // Links within the dropdown menu
@@ -77,81 +62,106 @@
     padding: 3px 20px;
     clear: both;
     font-weight: normal;
-    line-height: $baseLineHeight;
-    color: $dropdownLinkColor;
-    white-space: nowrap;
+    line-height: $line-height-base;
+    color: $dropdown-link-color;
+    white-space: nowrap; // prevent links from randomly breaking onto new lines
   }
 }
 
 // Hover/Focus state
-// -----------
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:focus > a {
-  text-decoration: none;
-  color: $dropdownLinkColorHover;
-  @include gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%));
-}
-
-// Active state
-// ------------
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: $dropdownLinkColorActive;
-  text-decoration: none;
-  outline: 0;
-  @include gradient-vertical($dropdownLinkBackgroundActive, darken($dropdownLinkBackgroundActive, 5%));
-}
-
-// Disabled state
-// --------------
-// Gray out text and ensure the hover/focus state remains gray
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: $grayLight;
-}
-// Nuke hover/focus effects
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  background-color: transparent;
-  background-image: none; // Remove CSS gradient
-  @include reset-filter();
-  cursor: default;
-}
-
-// Open state for the dropdown
-// ---------------------------
-.open {
-  // IE7's z-index only goes to the nearest positioned ancestor, which would
-  // make the menu appear below buttons that appeared later on the page
-  *z-index: $zindexDropdown;
-
-  & > .dropdown-menu {
-    display: block;
+.dropdown-menu > li > a {
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    color: $dropdown-link-hover-color;
+    background-color: $dropdown-link-hover-bg;
   }
 }
 
+// Active state
+.dropdown-menu > .active > a {
+  &,
+  &:hover,
+  &:focus {
+    color: $dropdown-link-active-color;
+    text-decoration: none;
+    outline: 0;
+    background-color: $dropdown-link-active-bg;
+  }
+}
+
+// Disabled state
+//
+// Gray out text and ensure the hover/focus state remains gray
+
+.dropdown-menu > .disabled > a {
+  &,
+  &:hover,
+  &:focus {
+    color: $dropdown-link-disabled-color;
+  }
+}
+// Nuke hover/focus effects
+.dropdown-menu > .disabled > a {
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    background-color: transparent;
+    background-image: none; // Remove CSS gradient
+    @include reset-filter();
+    cursor: not-allowed;
+  }
+}
+
+// Open state for the dropdown
+.open {
+  // Show the menu
+  > .dropdown-menu {
+    display: block;
+  }
+
+  // Remove the outline when :focus is triggered
+  > a {
+    outline: 0;
+  }
+}
+
+// Dropdown section headers
+.dropdown-header {
+  display: block;
+  padding: 3px 20px;
+  font-size: $font-size-small;
+  line-height: $line-height-base;
+  color: $dropdown-header-color;
+}
+
+// Backdrop to catch body clicks on mobile, etc.
+.dropdown-backdrop {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  z-index: $zindex-dropdown - 10;
+}
+
 // Right aligned dropdowns
-// ---------------------------
 .pull-right > .dropdown-menu {
   right: 0;
   left: auto;
 }
 
 // Allow for dropdowns to go bottom up (aka, dropup-menu)
-// ------------------------------------------------------
+//
 // Just add .dropup after the standard .dropdown class and you're set, bro.
 // TODO: abstract this so that the navbar fixed styles are not placed here?
+
 .dropup,
 .navbar-fixed-bottom .dropdown {
   // Reverse the caret
   .caret {
     border-top: 0;
-    border-bottom: 4px solid $black;
+    border-bottom: $caret-width-base solid;
     content: "";
   }
   // Different positioning for bottom up menu
@@ -162,76 +172,17 @@
   }
 }
 
-// Sub menus
-// ---------------------------
-.dropdown-submenu {
-  position: relative;
-}
-// Default dropdowns
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  @include border-radius(0 6px 6px 6px);
-}
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
 
-// Dropups
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  @include border-radius(5px 5px 5px 0);
-}
+// Component alignment
+//
+// Reiterate per navbar.less and the modified component alignment there.
 
-// Caret to indicate there is a submenu
-.dropdown-submenu > a:after {
-  display: block;
-  content: " ";
-  float: right;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  border-left-color: darken($dropdownBackground, 20%);
-  margin-top: 5px;
-  margin-right: -10px;
-}
-.dropdown-submenu:hover > a:after {
-  border-left-color: $dropdownLinkColorHover;
-}
-
-// Left aligned submenus
-.dropdown-submenu.pull-left {
-  // Undo the float
-  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
-  float: none;
-
-  // Positioning the submenu
-  > .dropdown-menu {
-    left: -100%;
-    margin-left: 10px;
-    @include border-radius(6px 0 6px 6px);
+@media (min-width: $grid-float-breakpoint) {
+  .navbar-right {
+    .dropdown-menu {
+      right: 0;
+      left: auto;
+    }
   }
 }
 
-// Tweak nav headers
-// -----------------
-// Increase padding from 15px to 20px on sides
-.dropdown .dropdown-menu .nav-header {
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-// Typeahead
-// ---------
-.typeahead {
-  z-index: 1051;
-  margin-top: 2px; // give it some space to breathe
-  @include border-radius($baseBorderRadius);
-}

app/styles/bootstrap/_forms.scss

@@ -3,13 +3,9 @@
 // --------------------------------------------------
 
 
-// GENERAL STYLES
-// --------------
-
-// Make all forms have space below them
-form {
-  margin: 0 0 $baseLineHeight;
-}
+// Normalize non-controls
+//
+// Restyle and baseline non-control form elements.
 
 fieldset {
   padding: 0;
@@ -17,153 +13,43 @@ fieldset {
   border: 0;
 }
 
-// Groups of fields with labels on top (legends)
 legend {
   display: block;
   width: 100%;
   padding: 0;
-  margin-bottom: $baseLineHeight;
-  font-size: $baseFontSize * 1.5;
-  line-height: $baseLineHeight * 2;
-  color: $grayDark;
+  margin-bottom: $line-height-computed;
+  font-size: ($font-size-base * 1.5);
+  line-height: inherit;
+  color: $legend-color;
   border: 0;
-  border-bottom: 1px solid #e5e5e5;
-
-  // Small
-  small {
-    font-size: $baseLineHeight * .75;
-    color: $grayLight;
-  }
+  border-bottom: 1px solid $legend-border-color;
 }
 
-// Set font for forms
-label,
-input,
-button,
-select,
-textarea {
-  @include font-shorthand($baseFontSize, normal, $baseLineHeight); // Set size, weight, line-height here
-}
-input,
-button,
-select,
-textarea {
-  font-family: $baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
-}
-
-// Identify controls by their labels
 label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-// Form controls
-// -------------------------
-
-// Shared size and type resets
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
   display: inline-block;
-  height: $baseLineHeight;
-  padding: 4px 6px;
-  margin-bottom: $baseLineHeight / 2;;
-  font-size: $baseFontSize;
-  line-height: $baseLineHeight;
-  color: $gray;
-  @include border-radius($inputBorderRadius);
-  vertical-align: middle;
+  margin-bottom: 5px;
+  font-weight: bold;
 }
 
-// Reset appearance properties for textual inputs and textarea
-// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
-input,
-textarea,
-.uneditable-input {
-  width: 206px; // plus 12px padding and 2px border
-}
-// Reset height since textareas have rows
-textarea {
-  height: auto;
-}
-// Everything else
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: $inputBackground;
-  border: 1px solid $inputBorder;
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  @include transition(border linear .2s, box-shadow linear .2s);
 
-  // Focus state
-  &:focus {
-    border-color: rgba(82,168,236,.8);
-    outline: 0;
-    outline: thin dotted \9; /* IE6-9 */
-    @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6));
-  }
+// Normalize form controls
+
+// Override content-box in Normalize (* isn't specific enough)
+input[type="search"] {
+  @include box-sizing(border-box);
 }
 
 // Position radios and checkboxes better
 input[type="radio"],
 input[type="checkbox"] {
   margin: 4px 0 0;
-  *margin-top: 0; /* IE7 */
   margin-top: 1px \9; /* IE8-9 */
   line-height: normal;
 }
 
-// Reset width of input images, buttons, radios, checkboxes
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto; // Override of generic input selector
-}
-
 // Set the height of select and file controls to match text inputs
-select,
 input[type="file"] {
-  height: $inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */
-  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: $inputHeight;
-}
-
-// Make select elements obey height by applying a border
-select {
-  width: 220px; // default input width + 10px of padding that doesn't get applied
-  border: 1px solid $inputBorder;
-  background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color
+  display: block;
 }
 
 // Make multiple select elements height not fixed
@@ -172,518 +58,317 @@ select[size] {
   height: auto;
 }
 
+// Fix optgroup Firefox bug per https://github.com/twbs/bootstrap/issues/7611
+select optgroup {
+  font-size: inherit;
+  font-style: inherit;
+  font-family: inherit;
+}
+
 // Focus for select, file, radio, and checkbox
-select:focus,
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
   @include tab-focus();
 }
 
-
-// Uneditable inputs
-// -------------------------
-
-// Make uneditable inputs look inactive
-.uneditable-input,
-.uneditable-textarea {
-  color: $grayLight;
-  background-color: darken($inputBackground, 1%);
-  border-color: $inputBorder;
-  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
+// Fix for Chrome number input
+// Setting certain font-sizes causes the `I` bar to appear on hover of the bottom increment button.
+// See https://github.com/twbs/bootstrap/issues/8350 for more.
+input[type="number"] {
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    height: auto;
+  }
 }
 
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
-  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
-  white-space: nowrap;
+// Adjust output element
+output {
+  display: block;
+  padding-top: ($padding-base-vertical + 1);
+  font-size: $font-size-base;
+  line-height: $line-height-base;
+  color: $input-color;
+  vertical-align: middle;
 }
 
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
-  width: auto;
+
+// Common form controls
+//
+// Shared size and type resets for form controls. Apply `.form-control` to any
+// of the following form controls:
+//
+// select
+// textarea
+// input[type="text"]
+// input[type="password"]
+// input[type="datetime"]
+// input[type="datetime-local"]
+// input[type="date"]
+// input[type="month"]
+// input[type="time"]
+// input[type="week"]
+// input[type="number"]
+// input[type="email"]
+// input[type="url"]
+// input[type="search"]
+// input[type="tel"]
+// input[type="color"]
+
+.form-control {
+  display: block;
+  width: 100%;
+  height: $input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
+  padding: $padding-base-vertical $padding-base-horizontal;
+  font-size: $font-size-base;
+  line-height: $line-height-base;
+  color: $input-color;
+  vertical-align: middle;
+  background-color: $input-bg;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
+  border: 1px solid $input-border;
+  border-radius: $input-border-radius;
+  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
+
+  // Customize the `:focus` state to imitate native WebKit styles.
+  @include form-control-focus();
+
+  // Placeholder
+  //
+  // Placeholder text gets special styles because when browsers invalidate entire
+  // lines if it doesn't understand a selector/
+  @include placeholder();
+
+  // Disabled and read-only inputs
+  // Note: HTML5 says that controls under a fieldset > legend:first-child won't
+  // be disabled if the fieldset is disabled. Due to implementation difficulty,
+  // we don't honor that edge case; we style them as disabled anyway.
+  &[disabled],
+  &[readonly],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+    background-color: $input-bg-disabled;
+  }
+
+  // [converter] extracted textarea& to textarea.form-control
+}
+
+// Reset height for `textarea`s
+textarea.form-control {
   height: auto;
 }
 
 
-// Placeholder
-// -------------------------
+// Form groups
+//
+// Designed to help with the organization and spacing of vertical forms. For
+// horizontal forms, use the predefined grid classes.
 
-// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
-input,
-textarea {
-  @include placeholder();
+.form-group {
+  margin-bottom: 15px;
 }
 
 
-// CHECKBOXES & RADIOS
-// -------------------
+// Checkboxes and radios
+//
+// Indent the labels to position radios/checkboxes as hanging controls.
 
-// Indent the labels to position radios/checkboxes as hanging
 .radio,
 .checkbox {
-  min-height: $baseLineHeight; // clear the floating input if there is no label text
+  display: block;
+  min-height: $line-height-computed; // clear the floating input if there is no label text
+  margin-top: 10px;
+  margin-bottom: 10px;
   padding-left: 20px;
+  vertical-align: middle;
+  label {
+    display: inline;
+    margin-bottom: 0;
+    font-weight: normal;
+    cursor: pointer;
+  }
 }
 .radio input[type="radio"],
-.checkbox input[type="checkbox"] {
+.radio-inline input[type="radio"],
+.checkbox input[type="checkbox"],
+.checkbox-inline input[type="checkbox"] {
   float: left;
   margin-left: -20px;
 }
-
-// Move the options list down to align with labels
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px; // has to be padding because margin collaspes
+.radio + .radio,
+.checkbox + .checkbox {
+  margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing
 }
 
 // Radios and checkboxes on same line
-// TODO v3: Convert .inline to .control-inline
-.radio.inline,
-.checkbox.inline {
+.radio-inline,
+.checkbox-inline {
   display: inline-block;
-  padding-top: 5px;
+  padding-left: 20px;
   margin-bottom: 0;
   vertical-align: middle;
+  font-weight: normal;
+  cursor: pointer;
 }
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
+.radio-inline + .radio-inline,
+.checkbox-inline + .checkbox-inline {
+  margin-top: 0;
   margin-left: 10px; // space out consecutive inline controls
 }
 
-
-
-// INPUT SIZES
-// -----------
-
-// General classes for quick sizes
-.input-mini       { width: 60px; }
-.input-small      { width: 90px; }
-.input-medium     { width: 150px; }
-.input-large      { width: 210px; }
-.input-xlarge     { width: 270px; }
-.input-xxlarge    { width: 530px; }
-
-// Grid style input sizes
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-// Redeclare since the fluid row class is more specific
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-// Ensure input-prepend/append never wraps
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-
-
-// GRID SIZING FOR INPUTS
-// ----------------------
-
-// Grid sizes
-@include grid-input($gridColumnWidth, $gridGutterWidth);
-
-// Control row for multiple inputs per line
-.controls-row {
-  @include clearfix(); // Clear the float from controls
-}
-
-// Float to collapse white-space for proper grid alignment
-.controls-row [class*="span"],
-// Redeclare the fluid grid collapse since we undo the float for inputs
-.row-fluid .controls-row [class*="span"] {
-  float: left;
-}
-// Explicity set top padding on all checkboxes/radios, not just first-child
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
-
-
-
-// DISABLED STATE
-// --------------
-
-// Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: $inputDisabledBackground;
-}
-// Explicitly reset the colors here
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-
-
-
-// FORM FIELD FEEDBACK STATES
-// --------------------------
-
-// Warning
-.control-group.warning {
-  @include formFieldState($warningText, $warningText, $warningBackground);
-}
-// Error
-.control-group.error {
-  @include formFieldState($errorText, $errorText, $errorBackground);
-}
-// Success
-.control-group.success {
-  @include formFieldState($successText, $successText, $successBackground);
-}
-// Info
-.control-group.info {
-  @include formFieldState($infoText, $infoText, $infoBackground);
-}
-
-// HTML5 invalid states
-// Shares styles with the .control-group.error above
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-  &:focus {
-    border-color: darken(#ee5f5b, 10%);
-    @include box-shadow(0 0 6px lighten(#ee5f5b, 20%));
+// Apply same disabled cursor tweak as for inputs
+//
+// Note: Neither radios nor checkboxes can be readonly.
+input[type="radio"],
+input[type="checkbox"],
+.radio,
+.radio-inline,
+.checkbox,
+.checkbox-inline {
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: not-allowed;
   }
 }
 
+// Form control sizing
+
+@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
+
+@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
 
 
-// FORM ACTIONS
-// ------------
+// Form control feedback states
+//
+// Apply contextual and semantic states to individual form controls.
 
-.form-actions {
-  padding: ($baseLineHeight - 1) 20px $baseLineHeight;
-  margin-top: $baseLineHeight;
-  margin-bottom: $baseLineHeight;
-  background-color: $formActionsBackground;
-  border-top: 1px solid #e5e5e5;
-  @include clearfix(); // Adding clearfix to allow for .pull-right button containers
+// Warning
+.has-warning {
+  @include form-control-validation($state-warning-text, $state-warning-text, $state-warning-bg);
+}
+// Error
+.has-error {
+  @include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg);
+}
+// Success
+.has-success {
+  @include form-control-validation($state-success-text, $state-success-text, $state-success-bg);
 }
 
 
+// Static form control text
+//
+// Apply class to a `p` element to make any string of text align with labels in
+// a horizontal form layout.
 
-// HELP TEXT
-// ---------
-
-.help-block,
-.help-inline {
-  color: lighten($textColor, 15%); // lighten the text some for contrast
+.form-control-static {
+  margin-bottom: 0; // Remove default margin from `p`
 }
 
+
+// Help text
+//
+// Apply to any element you wish to create light text for placement immediately
+// below a form control. Use for general help, formatting, or instructional text.
+
 .help-block {
   display: block; // account for any element using help-block
-  margin-bottom: $baseLineHeight / 2;
-}
-
-.help-inline {
-  display: inline-block;
-  @include ie7-inline-block();
-  vertical-align: middle;
-  padding-left: 5px;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  color: lighten($text-color, 25%); // lighten the text some for contrast
 }
 
 
 
-// INPUT GROUPS
-// ------------
+// Inline forms
+//
+// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
+// forms begin stacked on extra small (mobile) devices and then go inline when
+// viewports reach <768px.
+//
+// Requires wrapping inputs and labels with `.form-group` for proper display of
+// default HTML form controls and our custom form controls (e.g., input groups).
+//
+// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
 
-// Allow us to put symbols and text within the input field for a cleaner look
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: $baseLineHeight / 2;
-  vertical-align: middle;
-  font-size: 0; // white space collapse hack
-  white-space: nowrap; // Prevent span and input from separating
+.form-inline {
 
-  // Reset the white space collapse hack
-  input,
-  select,
-  .uneditable-input,
-  .dropdown-menu,
-  .popover {
-    font-size: $baseFontSize;
-  }
+  // Kick in the inline
+  @media (min-width: $screen-sm) {
+    // Inline-block all the things for "inline"
+    .form-group  {
+      display: inline-block;
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
 
-  input,
-  select,
-  .uneditable-input {
-    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
-    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
-    *margin-left: 0;
-    vertical-align: top;
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-    // Make input on top when focused so blue border and shadow always show
-    &:focus {
-      z-index: 2;
+    // In navbar-form, allow folks to *not* use `.form-group`
+    .form-control {
+      display: inline-block;
+    }
+
+    // Override `width: 100%;` when not within a `.form-group`
+    select.form-control {
+      width: auto;
+    }
+
+    // Remove default margin on radios/checkboxes that were used for stacking, and
+    // then undo the floating of radios and checkboxes to match (which also avoids
+    // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
+    .radio,
+    .checkbox {
+      display: inline-block;
+      margin-top: 0;
+      margin-bottom: 0;
+      padding-left: 0;
+    }
+    .radio input[type="radio"],
+    .checkbox input[type="checkbox"] {
+      float: none;
+      margin-left: 0;
     }
   }
-  .add-on {
-    display: inline-block;
-    width: auto;
-    height: $baseLineHeight;
-    min-width: 16px;
-    padding: 4px 5px;
-    font-size: $baseFontSize;
-    font-weight: normal;
-    line-height: $baseLineHeight;
-    text-align: center;
-    text-shadow: 0 1px 0 $white;
-    background-color: $grayLighter;
-    border: 1px solid #ccc;
-  }
-  .add-on,
-  .btn,
-  .btn-group > .dropdown-toggle {
-    vertical-align: top;
-    @include border-radius(0);
-  }
-  .active {
-    background-color: lighten($green, 30);
-    border-color: $green;
-  }
-}
-
-.input-prepend {
-  .add-on,
-  .btn {
-    margin-right: -1px;
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    // FYI, `.btn:first-child` accounts for a button group that's prepended
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
-  }
-}
-
-.input-append {
-  input,
-  select,
-  .uneditable-input {
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
-    + .btn-group .btn:last-child {
-      @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-    }
-  }
-  .add-on,
-  .btn,
-  .btn-group {
-    margin-left: -1px;
-  }
-  .add-on:last-child,
-  .btn:last-child,
-  .btn-group:last-child > .dropdown-toggle {
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-  }
-}
-
-// Remove all border-radius for inputs with both prepend and append
-.input-prepend.input-append {
-  input,
-  select,
-  .uneditable-input {
-    @include border-radius(0);
-    + .btn-group .btn {
-      @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-    }
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    margin-right: -1px;
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
-  }
-  .add-on:last-child,
-  .btn:last-child {
-    margin-left: -1px;
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-  }
-  .btn-group:first-child {
-    margin-left: 0;
-  }
 }
 
 
-
-
-// SEARCH FORM
-// -----------
-
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
-  margin-bottom: 0; // Remove the default margin on all inputs
-  @include border-radius(15px);
-}
-
-/* Allow for input prepend/append in search forms */
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  @include border-radius(0); // Override due to specificity
-}
-.form-search .input-append .search-query {
-  @include border-radius(14px 0 0 14px);
-}
-.form-search .input-append .btn {
-  @include border-radius(0 14px 14px 0);
-}
-.form-search .input-prepend .search-query {
-  @include border-radius(0 14px 14px 0);
-}
-.form-search .input-prepend .btn {
-  @include border-radius(14px 0 0 14px);
-}
-
-
-
-
-// HORIZONTAL & VERTICAL FORMS
-// ---------------------------
-
-// Common properties
-// -----------------
-
-.form-search,
-.form-inline,
-.form-horizontal {
-  input,
-  textarea,
-  select,
-  .help-inline,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    display: inline-block;
-    @include ie7-inline-block();
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  // Re-hide hidden elements due to specifity
-  .hide {
-    display: none;
-  }
-}
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-// Remove margin for input-prepend/-append
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-// Inline checkbox/radio labels (remove padding on left)
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-// Remove float and margin, set to inline-block
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-
-// Margin to space out fieldsets
-.control-group {
-  margin-bottom: $baseLineHeight / 2;
-}
-
-// Legend collapses margin, so next element is responsible for spacing
-legend + .control-group {
-  margin-top: $baseLineHeight;
-  -webkit-margin-top-collapse: separate;
-}
-
-// Horizontal-specific styles
-// --------------------------
+// Horizontal forms
+//
+// Horizontal forms are built on grid classes and allow you to create forms with
+// labels on the left and inputs on the right.
 
 .form-horizontal {
-  // Increase spacing between groups
-  .control-group {
-    margin-bottom: $baseLineHeight;
-    @include clearfix();
-  }
-  // Float the labels left
-  .control-label {
-    float: left;
-    width: $horizontalComponentOffset - 20;
-    padding-top: 5px;
-    text-align: right;
-  }
-  // Move over all input controls and content
-  .controls {
-    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
-    // don't inherit the margin of the parent, in this case .controls
-    *display: inline-block;
-    *padding-left: 20px;
-    margin-left: $horizontalComponentOffset;
-    *margin-left: 0;
-    &:first-child {
-      *padding-left: $horizontalComponentOffset;
-    }
-  }
-  // Remove bottom margin on block level help text since that's accounted for on .control-group
-  .help-block {
+
+  // Consistent vertical alignment of labels, radios, and checkboxes
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline {
+    margin-top: 0;
     margin-bottom: 0;
+    padding-top: ($padding-base-vertical + 1); // Default padding plus a border
   }
-  // And apply it only to .help-block instances that follow a form control
-  input,
-  select,
-  textarea,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    + .help-block {
-      margin-top: $baseLineHeight / 2;
+  // Account for padding we're adding to ensure the alignment and of help text
+  // and other content below items
+  .radio,
+  .checkbox {
+    min-height: $line-height-computed + ($padding-base-vertical + 1);
+  }
+
+  // Make form groups behave like rows
+  .form-group {
+    @include make-row();
+  }
+
+  .form-control-static {
+    padding-top: ($padding-base-vertical + 1);
+  }
+
+  // Only right align form labels here when the columns stop stacking
+  @media (min-width: $screen-sm-min) {
+    .control-label {
+      text-align: right;
     }
   }
-  // Move over buttons in .form-actions to align with .controls
-  .form-actions {
-    padding-left: $horizontalComponentOffset;
-  }
 }

app/styles/bootstrap/_glyphicons.scss

@@ -0,0 +1,237 @@
+//
+// Glyphicons for Bootstrap
+//
+// Since icons are fonts, they can be placed anywhere text is placed and are
+// thus automatically sized to match the surrounding child. To use, create an
+// inline element with the appropriate classes, like so:
+//
+// <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
+
+// Import the fonts
+@font-face {
+  font-family: 'Glyphicons Halflings';
+  src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
+  src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular'), '#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular')) format('svg');
+}
+
+// Catchall baseclass
+.glyphicon {
+  position: relative;
+  top: 1px;
+  display: inline-block;
+  font-family: 'Glyphicons Halflings';
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  &:empty {
+    width: 1em;
+  }
+}
+
+// Individual icons
+.glyphicon-asterisk               { &:before { content: "\2a"; } }
+.glyphicon-plus                   { &:before { content: "\2b"; } }
+.glyphicon-euro                   { &:before { content: "\20ac"; } }
+.glyphicon-minus                  { &:before { content: "\2212"; } }
+.glyphicon-cloud                  { &:before { content: "\2601"; } }
+.glyphicon-envelope               { &:before { content: "\2709"; } }
+.glyphicon-pencil                 { &:before { content: "\270f"; } }
+.glyphicon-glass                  { &:before { content: "\e001"; } }
+.glyphicon-music                  { &:before { content: "\e002"; } }
+.glyphicon-search                 { &:before { content: "\e003"; } }
+.glyphicon-heart                  { &:before { content: "\e005"; } }
+.glyphicon-star                   { &:before { content: "\e006"; } }
+.glyphicon-star-empty             { &:before { content: "\e007"; } }
+.glyphicon-user                   { &:before { content: "\e008"; } }
+.glyphicon-film                   { &:before { content: "\e009"; } }
+.glyphicon-th-large               { &:before { content: "\e010"; } }
+.glyphicon-th                     { &:before { content: "\e011"; } }
+.glyphicon-th-list                { &:before { content: "\e012"; } }
+.glyphicon-ok                     { &:before { content: "\e013"; } }
+.glyphicon-remove                 { &:before { content: "\e014"; } }
+.glyphicon-zoom-in                { &:before { content: "\e015"; } }
+.glyphicon-zoom-out               { &:before { content: "\e016"; } }
+.glyphicon-off                    { &:before { content: "\e017"; } }
+.glyphicon-signal                 { &:before { content: "\e018"; } }
+.glyphicon-cog                    { &:before { content: "\e019"; } }
+.glyphicon-trash                  { &:before { content: "\e020"; } }
+.glyphicon-home                   { &:before { content: "\e021"; } }
+.glyphicon-file                   { &:before { content: "\e022"; } }
+.glyphicon-time                   { &:before { content: "\e023"; } }
+.glyphicon-road                   { &:before { content: "\e024"; } }
+.glyphicon-download-alt           { &:before { content: "\e025"; } }
+.glyphicon-download               { &:before { content: "\e026"; } }
+.glyphicon-upload                 { &:before { content: "\e027"; } }
+.glyphicon-inbox                  { &:before { content: "\e028"; } }
+.glyphicon-play-circle            { &:before { content: "\e029"; } }
+.glyphicon-repeat                 { &:before { content: "\e030"; } }
+.glyphicon-refresh                { &:before { content: "\e031"; } }
+.glyphicon-list-alt               { &:before { content: "\e032"; } }
+.glyphicon-lock                   { &:before { content: "\e033"; } }
+.glyphicon-flag                   { &:before { content: "\e034"; } }
+.glyphicon-headphones             { &:before { content: "\e035"; } }
+.glyphicon-volume-off             { &:before { content: "\e036"; } }
+.glyphicon-volume-down            { &:before { content: "\e037"; } }
+.glyphicon-volume-up              { &:before { content: "\e038"; } }
+.glyphicon-qrcode                 { &:before { content: "\e039"; } }
+.glyphicon-barcode                { &:before { content: "\e040"; } }
+.glyphicon-tag                    { &:before { content: "\e041"; } }
+.glyphicon-tags                   { &:before { content: "\e042"; } }
+.glyphicon-book                   { &:before { content: "\e043"; } }
+.glyphicon-bookmark               { &:before { content: "\e044"; } }
+.glyphicon-print                  { &:before { content: "\e045"; } }
+.glyphicon-camera                 { &:before { content: "\e046"; } }
+.glyphicon-font                   { &:before { content: "\e047"; } }
+.glyphicon-bold                   { &:before { content: "\e048"; } }
+.glyphicon-italic                 { &:before { content: "\e049"; } }
+.glyphicon-text-height            { &:before { content: "\e050"; } }
+.glyphicon-text-width             { &:before { content: "\e051"; } }
+.glyphicon-align-left             { &:before { content: "\e052"; } }
+.glyphicon-align-center           { &:before { content: "\e053"; } }
+.glyphicon-align-right            { &:before { content: "\e054"; } }
+.glyphicon-align-justify          { &:before { content: "\e055"; } }
+.glyphicon-list                   { &:before { content: "\e056"; } }
+.glyphicon-indent-left            { &:before { content: "\e057"; } }
+.glyphicon-indent-right           { &:before { content: "\e058"; } }
+.glyphicon-facetime-video         { &:before { content: "\e059"; } }
+.glyphicon-picture                { &:before { content: "\e060"; } }
+.glyphicon-map-marker             { &:before { content: "\e062"; } }
+.glyphicon-adjust                 { &:before { content: "\e063"; } }
+.glyphicon-tint                   { &:before { content: "\e064"; } }
+.glyphicon-edit                   { &:before { content: "\e065"; } }
+.glyphicon-share                  { &:before { content: "\e066"; } }
+.glyphicon-check                  { &:before { content: "\e067"; } }
+.glyphicon-move                   { &:before { content: "\e068"; } }
+.glyphicon-step-backward          { &:before { content: "\e069"; } }
+.glyphicon-fast-backward          { &:before { content: "\e070"; } }
+.glyphicon-backward               { &:before { content: "\e071"; } }
+.glyphicon-play                   { &:before { content: "\e072"; } }
+.glyphicon-pause                  { &:before { content: "\e073"; } }
+.glyphicon-stop                   { &:before { content: "\e074"; } }
+.glyphicon-forward                { &:before { content: "\e075"; } }
+.glyphicon-fast-forward           { &:before { content: "\e076"; } }
+.glyphicon-step-forward           { &:before { content: "\e077"; } }
+.glyphicon-eject                  { &:before { content: "\e078"; } }
+.glyphicon-chevron-left           { &:before { content: "\e079"; } }
+.glyphicon-chevron-right          { &:before { content: "\e080"; } }
+.glyphicon-plus-sign              { &:before { content: "\e081"; } }
+.glyphicon-minus-sign             { &:before { content: "\e082"; } }
+.glyphicon-remove-sign            { &:before { content: "\e083"; } }
+.glyphicon-ok-sign                { &:before { content: "\e084"; } }
+.glyphicon-question-sign          { &:before { content: "\e085"; } }
+.glyphicon-info-sign              { &:before { content: "\e086"; } }
+.glyphicon-screenshot             { &:before { content: "\e087"; } }
+.glyphicon-remove-circle          { &:before { content: "\e088"; } }
+.glyphicon-ok-circle              { &:before { content: "\e089"; } }
+.glyphicon-ban-circle             { &:before { content: "\e090"; } }
+.glyphicon-arrow-left             { &:before { content: "\e091"; } }
+.glyphicon-arrow-right            { &:before { content: "\e092"; } }
+.glyphicon-arrow-up               { &:before { content: "\e093"; } }
+.glyphicon-arrow-down             { &:before { content: "\e094"; } }
+.glyphicon-share-alt              { &:before { content: "\e095"; } }
+.glyphicon-resize-full            { &:before { content: "\e096"; } }
+.glyphicon-resize-small           { &:before { content: "\e097"; } }
+.glyphicon-exclamation-sign       { &:before { content: "\e101"; } }
+.glyphicon-gift                   { &:before { content: "\e102"; } }
+.glyphicon-leaf                   { &:before { content: "\e103"; } }
+.glyphicon-fire                   { &:before { content: "\e104"; } }
+.glyphicon-eye-open               { &:before { content: "\e105"; } }
+.glyphicon-eye-close              { &:before { content: "\e106"; } }
+.glyphicon-warning-sign           { &:before { content: "\e107"; } }
+.glyphicon-plane                  { &:before { content: "\e108"; } }
+.glyphicon-calendar               { &:before { content: "\e109"; } }
+.glyphicon-random                 { &:before { content: "\e110"; } }
+.glyphicon-comment                { &:before { content: "\e111"; } }
+.glyphicon-magnet                 { &:before { content: "\e112"; } }
+.glyphicon-chevron-up             { &:before { content: "\e113"; } }
+.glyphicon-chevron-down           { &:before { content: "\e114"; } }
+.glyphicon-retweet                { &:before { content: "\e115"; } }
+.glyphicon-shopping-cart          { &:before { content: "\e116"; } }
+.glyphicon-folder-close           { &:before { content: "\e117"; } }
+.glyphicon-folder-open            { &:before { content: "\e118"; } }
+.glyphicon-resize-vertical        { &:before { content: "\e119"; } }
+.glyphicon-resize-horizontal      { &:before { content: "\e120"; } }
+.glyphicon-hdd                    { &:before { content: "\e121"; } }
+.glyphicon-bullhorn               { &:before { content: "\e122"; } }
+.glyphicon-bell                   { &:before { content: "\e123"; } }
+.glyphicon-certificate            { &:before { content: "\e124"; } }
+.glyphicon-thumbs-up              { &:before { content: "\e125"; } }
+.glyphicon-thumbs-down            { &:before { content: "\e126"; } }
+.glyphicon-hand-right             { &:before { content: "\e127"; } }
+.glyphicon-hand-left              { &:before { content: "\e128"; } }
+.glyphicon-hand-up                { &:before { content: "\e129"; } }
+.glyphicon-hand-down              { &:before { content: "\e130"; } }
+.glyphicon-circle-arrow-right     { &:before { content: "\e131"; } }
+.glyphicon-circle-arrow-left      { &:before { content: "\e132"; } }
+.glyphicon-circle-arrow-up        { &:before { content: "\e133"; } }
+.glyphicon-circle-arrow-down      { &:before { content: "\e134"; } }
+.glyphicon-globe                  { &:before { content: "\e135"; } }
+.glyphicon-wrench                 { &:before { content: "\e136"; } }
+.glyphicon-tasks                  { &:before { content: "\e137"; } }
+.glyphicon-filter                 { &:before { content: "\e138"; } }
+.glyphicon-briefcase              { &:before { content: "\e139"; } }
+.glyphicon-fullscreen             { &:before { content: "\e140"; } }
+.glyphicon-dashboard              { &:before { content: "\e141"; } }
+.glyphicon-paperclip              { &:before { content: "\e142"; } }
+.glyphicon-heart-empty            { &:before { content: "\e143"; } }
+.glyphicon-link                   { &:before { content: "\e144"; } }
+.glyphicon-phone                  { &:before { content: "\e145"; } }
+.glyphicon-pushpin                { &:before { content: "\e146"; } }
+.glyphicon-usd                    { &:before { content: "\e148"; } }
+.glyphicon-gbp                    { &:before { content: "\e149"; } }
+.glyphicon-sort                   { &:before { content: "\e150"; } }
+.glyphicon-sort-by-alphabet       { &:before { content: "\e151"; } }
+.glyphicon-sort-by-alphabet-alt   { &:before { content: "\e152"; } }
+.glyphicon-sort-by-order          { &:before { content: "\e153"; } }
+.glyphicon-sort-by-order-alt      { &:before { content: "\e154"; } }
+.glyphicon-sort-by-attributes     { &:before { content: "\e155"; } }
+.glyphicon-sort-by-attributes-alt { &:before { content: "\e156"; } }
+.glyphicon-unchecked              { &:before { content: "\e157"; } }
+.glyphicon-expand                 { &:before { content: "\e158"; } }
+.glyphicon-collapse-down          { &:before { content: "\e159"; } }
+.glyphicon-collapse-up            { &:before { content: "\e160"; } }
+.glyphicon-log-in                 { &:before { content: "\e161"; } }
+.glyphicon-flash                  { &:before { content: "\e162"; } }
+.glyphicon-log-out                { &:before { content: "\e163"; } }
+.glyphicon-new-window             { &:before { content: "\e164"; } }
+.glyphicon-record                 { &:before { content: "\e165"; } }
+.glyphicon-save                   { &:before { content: "\e166"; } }
+.glyphicon-open                   { &:before { content: "\e167"; } }
+.glyphicon-saved                  { &:before { content: "\e168"; } }
+.glyphicon-import                 { &:before { content: "\e169"; } }
+.glyphicon-export                 { &:before { content: "\e170"; } }
+.glyphicon-send                   { &:before { content: "\e171"; } }
+.glyphicon-floppy-disk            { &:before { content: "\e172"; } }
+.glyphicon-floppy-saved           { &:before { content: "\e173"; } }
+.glyphicon-floppy-remove          { &:before { content: "\e174"; } }
+.glyphicon-floppy-save            { &:before { content: "\e175"; } }
+.glyphicon-floppy-open            { &:before { content: "\e176"; } }
+.glyphicon-credit-card            { &:before { content: "\e177"; } }
+.glyphicon-transfer               { &:before { content: "\e178"; } }
+.glyphicon-cutlery                { &:before { content: "\e179"; } }
+.glyphicon-header                 { &:before { content: "\e180"; } }
+.glyphicon-compressed             { &:before { content: "\e181"; } }
+.glyphicon-earphone               { &:before { content: "\e182"; } }
+.glyphicon-phone-alt              { &:before { content: "\e183"; } }
+.glyphicon-tower                  { &:before { content: "\e184"; } }
+.glyphicon-stats                  { &:before { content: "\e185"; } }
+.glyphicon-sd-video               { &:before { content: "\e186"; } }
+.glyphicon-hd-video               { &:before { content: "\e187"; } }
+.glyphicon-subtitles              { &:before { content: "\e188"; } }
+.glyphicon-sound-stereo           { &:before { content: "\e189"; } }
+.glyphicon-sound-dolby            { &:before { content: "\e190"; } }
+.glyphicon-sound-5-1              { &:before { content: "\e191"; } }
+.glyphicon-sound-6-1              { &:before { content: "\e192"; } }
+.glyphicon-sound-7-1              { &:before { content: "\e193"; } }
+.glyphicon-copyright-mark         { &:before { content: "\e194"; } }
+.glyphicon-registration-mark      { &:before { content: "\e195"; } }
+.glyphicon-cloud-download         { &:before { content: "\e197"; } }
+.glyphicon-cloud-upload           { &:before { content: "\e198"; } }
+.glyphicon-tree-conifer           { &:before { content: "\e199"; } }
+.glyphicon-tree-deciduous         { &:before { content: "\e200"; } }