Merge branch 'master' into production

app/lib/simulator/Simulator.coffee

@@ -236,6 +236,7 @@ module.exports = class Simulator extends CocoClass
     _.delay @cleanupAndSimulateAnotherTask, @retryDelayInSeconds * 1000
 
   processResults: (simulationResults) ->
+    return console.error "Weird, we destroyed the Simulator before it processed results?" if @destroyed
     taskResults = @formTaskResultsObject simulationResults
     unless taskResults.taskID
       console.error "*** Error: taskResults has no taskID ***\ntaskResults:", taskResults

app/lib/surface/CocoSprite.coffee

@@ -119,7 +119,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     $(image.image).one 'load', => @updateScale?()
     @configureMouse()
     @imageObject.sprite = @
-    @imageObject.layerPriority = @thangType.get 'layerPriority'
+    @imageObject.layerPriority = @thang?.layerPriority ? @thangType.get 'layerPriority'
     @imageObject.name = @thang?.spriteName or @thangType.get 'name'
     reg = @getOffset 'registration'
     @imageObject.regX = -reg.x
@@ -138,6 +138,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     if parent = @imageObject?.parent
       parent.removeChild @imageObject
       parent.addChild newImageObject
+      parent.updateLayerOrder()
     @imageObject = newImageObject
 
   buildFromSpriteSheet: (spriteSheet) ->
@@ -151,7 +152,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @configureMouse()
     # TODO: generalize this later?
     @imageObject.sprite = @
-    @imageObject.layerPriority = @thangType.get 'layerPriority'
+    @imageObject.layerPriority = @thang?.layerPriority ? @thangType.get 'layerPriority'
     @imageObject.name = @thang?.spriteName or @thangType.get 'name'
     @imageObject.on 'animationend', @playNextAction
     @finishSetup()

app/lib/surface/SpriteBoss.coffee

@@ -67,6 +67,7 @@ module.exports = class SpriteBoss extends CocoClass
         child.layerPriority = thang.layerPriority
         child.layerPriority ?= 0 if thang.isSelectable
         child.layerPriority ?= -40 if thang.isLand
+    child.layerPriority ?= 0
     return @spriteLayers['Default'] unless child.layerPriority
     layer = _.findLast @spriteLayers, (layer, name) ->
       layer.layerPriority <= child.layerPriority
@@ -78,6 +79,7 @@ module.exports = class SpriteBoss extends CocoClass
     console.error 'Sprite collision! Already have:', id if @sprites[id]
     @sprites[id] = sprite
     @spriteArray.push sprite
+    sprite.imageObject.layerPriority ?= sprite.thang?.layerPriority
     layer ?= @spriteLayers['Obstacle'] if sprite.thang?.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
     layer ?= @layerForChild sprite.imageObject, sprite
     layer.addChild sprite.imageObject

app/locale/ar.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/bg.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/ca.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/cs.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/da.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/de-AT.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/de-CH.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     tip_open_source: "CodeCombat isch 100% Open Source!"
     tip_beta_launch: "D CodeCombat Beta isch im Oktober 2013 online gange."
     tip_js_beginning: "JavaScript isch nur de Afang."
-    think_solution: "Denk über d Lösig noh, nid über s Problem."
+    tip_think_solution: "Denk über d Lösig noh, nid über s Problem."
     tip_theory_practice: "Theoretisch gits kein Unterschied zwüsche Theorie und Praxis. Praktisch aber scho. - Yogi Berra"
     tip_error_free: "Es git zwei Arte zum fehlerfreii Programm schriibe; nur di dritt funktioniert. - Alan Perils"
     tip_debugging_program: "Wenn Debugging de Prozess isch, mit dem mehr Bugs entfernt, denn mues Programmiere de sii, mit dem mer sie dri tuet. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/de-DE.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     tip_open_source: "CodeCombat ist 100% quelloffen!"
     tip_beta_launch: "CodeCombat startete seine Beta im Oktober 2013."
     tip_js_beginning: "JavaScript ist nur der Anfang."
-    think_solution: "Denke über die Lösung nach, nicht über das Problem."
+    tip_think_solution: "Denke über die Lösung nach, nicht über das Problem."
     tip_theory_practice: "In der Theorie gibt es keinen Unterschied zwischen Theorie und Praxis. In der Praxis schon. - Yogi Berra"
     tip_error_free: "Es gibt zwei Wege fehlerfreie Programme zu schreiben; nur der Dritte funktioniert. - Alan Perlis"
     tip_debugging_program: "Wenn Debugging der Prozess zum Fehler entfernen ist, dann muss Programmieren der Prozess sein Fehler zu machen. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    tournament_ended: "Tournament ended"
     tournament_rules: "Turnier-Regeln"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
     rules: "Regeln"
     winners: "Gewinner"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     candidate_sessions: "Kandidat-Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
   delta:
     added: "hinzugefügt"

app/locale/de.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     tip_open_source: "CodeCombat ist 100% quelloffen!"
     tip_beta_launch: "CodeCombat startete seine Beta im Oktober 2013."
     tip_js_beginning: "JavaScript ist nur der Anfang."
-    think_solution: "Denke über die Lösung nach, nicht über das Problem."
+    tip_think_solution: "Denke über die Lösung nach, nicht über das Problem."
     tip_theory_practice: "In der Theorie gibt es keinen Unterschied zwischen Theorie und Praxis. In der Praxis schon. - Yogi Berra"
     tip_error_free: "Es gibt zwei Wege fehlerfreie Programme zu schreiben; nur der Dritte funktioniert. - Alan Perlis"
     tip_debugging_program: "Wenn Debugging der Prozess zum Fehler entfernen ist, dann muss Programmieren der Prozess sein Fehler zu machen. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     tournament_ended: "Turnier beendet"
     tournament_rules: "Turnier-Regeln"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
     rules: "Regeln"
     winners: "Gewinner"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     candidate_sessions: "Kandidat-Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
   delta:
     added: "hinzugefügt"

app/locale/el.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/en-AU.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/en-GB.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/en-US.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/en.coffee

@@ -404,7 +404,7 @@
     tip_open_source: "CodeCombat is 100% open source!"
     tip_beta_launch: "CodeCombat launched its beta in October, 2013."
     tip_js_beginning: "JavaScript is just the beginning."
-    think_solution: "Think of the solution, not the problem."
+    tip_think_solution: "Think of the solution, not the problem."
     tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
     tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
     tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"

app/locale/es-419.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     tip_open_source: "¡CodeCombat es 100% código abierto!"
     tip_beta_launch: "CodeCombat lanzó su beta en Octubre del 2013."
     tip_js_beginning: "JavaScript es sólo el principio."
-    think_solution: "Piensa en la solución, no en el problema."
+#    tip_think_solution: "Think of the solution, not the problem."
     tip_theory_practice: "En teoría, no hay diferencia entre la teoría y la práctica. Pero en la práctica, si la hay. - Yogi Berra"
     tip_error_free: "Hay dos formas de escribir programas libres de errores; sólo la tercera funciona. - Alan Perlis"
     tip_debugging_program: "Si depurar es el proceso de remover errores, entonces programar debe ser el proceso de colocarlos. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/es-ES.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     tip_open_source: "¡CodeCombat es 100% open source!"
     tip_beta_launch: "CodeCombat lanzó su beta en Octubre de 2013."
     tip_js_beginning: "JavaScript es solo el principio."
-    think_solution: "Piensa en la solución, no en el problema."
+    tip_think_solution: "Piensa en la solución, no en el problema."
     tip_theory_practice: "En teoría, no hay diferencia entre la teoría y la práctica. Pero en la práctica, la hay. - Yogi Berra"
     tip_error_free: "Hay dos formas de escribir programas sin errores; solo la tercera funciona. - Alan Perlis"
     tip_debugging_program: "Si depurar es el proceso de eliminar bugs, entonces programar debe ser el proceso de crearlos. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
     rules: "Reglas"
     winners: "Ganadores"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
   delta:
     added: "Añadido"

app/locale/es.coffee

@@ -3,25 +3,25 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     loading: "Cargando..."
     saving: "Guardando..."
     sending: "Enviando..."
-#    send: "Send"
+    send: "Enviar..."
     cancel: "Cancelar"
     save: "Guardar"
 #    publish: "Publish"
-#    create: "Create"
+    create: "Crear..."
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
     manual: "Manual"
 #    fork: "Fork"
     play: "Jugar"
-#    retry: "Retry"
+    retry: "Reintentar"
 #    watch: "Watch"
 #    unwatch: "Unwatch"
 #    submit_patch: "Submit Patch"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
+  units:
+    second: "Segundo"
+    seconds: "Segundos"
 #    minute: "minute"
 #    minutes: "minutes"
 #    hour: "hour"
@@ -404,7 +404,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/fa.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/fi.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/fr.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tip_open_source: "CodeCombat est 100% open source!"
     tip_beta_launch: "La beta de CodeCombat a été lancée en Octobre 2013"
     tip_js_beginning: "JavaScript n'est que le commencement."
-    think_solution: "Reflechissez a propos de la solution et non du problème."
+    tip_think_solution: "Reflechissez a propos de la solution et non du problème."
     tip_theory_practice: "En théorie, il n'y a pas de différence entre la théorie et la pratique. Mais en pratique il y en a. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
     tip_debugging_program: "Si débugger est l'art de corriger les bugs, alors programmer est l'art d'en créer. . - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    tournament_ended: "Tournament ended"
     tournament_rules: "Règles du tournoi"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
     tournament_blurb_blog: "Sur notre blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
   delta:
     added: "Ajouté"

app/locale/he.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/hi.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/hu.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     tip_open_source: "A CodeCombat 100%-osan nyitott forráskódu."
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
     tip_js_beginning: "JavaScript csak a kezdet."
-    think_solution: "A megoldásra gondolj, ne a problémára!"
+    tip_think_solution: "A megoldásra gondolj, ne a problémára!"
     tip_theory_practice: "Elméletben nincs különbség elmélet és gyakorlat között. A gyakorlatban viszont van. - Yogi Berra"
     tip_error_free: "Két módon lehet hibátlan programot írni. De csak a harmadik működik. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/id.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/it.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/ja.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/ko.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     tip_open_source: "코드 컴뱃은 100% 오픈 소스 기반입니다!"
     tip_beta_launch: "코드 컴뱃은 2013년 10월에 베타 서비스를 출시했습니다."
     tip_js_beginning: "JavaScript는 단지 시작일 뿐입니다."
-    think_solution: "해결 방법을 고민해보세요, 문제를 고민하지 말구요."
+    tip_think_solution: "해결 방법을 고민해보세요, 문제를 고민하지 말구요"
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
     rules: "규칙"
     winners: "승리자"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/lt.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/ms.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/nb.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/nl-BE.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     tip_open_source: "CodeCombat is 100% open source!"
     tip_beta_launch: "CodeCombat lanceerde zijn beta versie in Oktober, 2013."
     tip_js_beginning: "JavaScript is nog maar het begin."
-    think_solution: "Denk aan de oplossing, niet aan het probleem"
+    tip_think_solution: "Denk aan de oplossing, niet aan het probleem."
     tip_theory_practice: "In theorie is er geen verschil tussen de theorie en de praktijk; in de praktijk is er wel een verschil. - Yogi Berra"
     tip_error_free: "Er zijn twee manieren om fout-vrije code te schrijven, maar enkele de derde manier werkt. - Alan Perlis"
     tip_debugging_program: "Als debuggen het proces is om bugs te verwijderen, dan moet programmeren het proces zijn om ze erin te stoppen. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/nl-NL.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     tip_open_source: "CodeCombat is 100% open source!"
     tip_beta_launch: "CodeCombat lanceerde zijn beta versie in Oktober, 2013."
     tip_js_beginning: "JavaScript is nog maar het begin."
-    think_solution: "Denk aan de oplossing, niet aan het probleem"
+    tip_think_solution: "Denk aan de oplossing, niet aan het probleem."
     tip_theory_practice: "In theorie is er geen verschil tussen de theorie en de praktijk; in de praktijk is er wel een verschil. - Yogi Berra"
     tip_error_free: "Er zijn twee manieren om fout-vrije code te schrijven, maar enkele de derde manier werkt. - Alan Perlis"
     tip_debugging_program: "Als debuggen het proces is om bugs te verwijderen, dan moet programmeren het proces zijn om ze erin te stoppen. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/nl.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     tip_open_source: "CodeCombat is 100% open source!"
     tip_beta_launch: "CodeCombat lanceerde zijn beta versie in Oktober, 2013."
     tip_js_beginning: "JavaScript is nog maar het begin."
-    think_solution: "Denk aan de oplossing, niet aan het probleem"
+    tip_think_solution: "Denk aan de oplossing, niet aan het probleem."
     tip_theory_practice: "In theorie is er geen verschil tussen de theorie en de praktijk; in de praktijk is er wel een verschil. - Yogi Berra"
     tip_error_free: "Er zijn twee manieren om fout-vrije code te schrijven, maar enkele de derde manier werkt. - Alan Perlis"
     tip_debugging_program: "Als debuggen het proces is om bugs te verwijderen, dan moet programmeren het proces zijn om ze erin te stoppen. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/nn.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/no.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/pl.coffee

@@ -72,7 +72,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
   login:
     sign_up: "Stwórz konto"
     log_in: "Zaloguj się"
-#    logging_in: "Logging In"
+    logging_in: "Logowanie..."
     log_out: "Wyloguj się"
     recover: "odzyskaj konto"
 
@@ -89,7 +89,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     creating: "Tworzenie konta..."
     sign_up: "Zarejestruj"
     log_in: "zaloguj się używając hasła"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
+    social_signup: "lub zaloguj się używając konta Facebook lub G+:"
 #    required: "You need to log in before you can go that way."
 
   home:
@@ -103,7 +103,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     for_beginners: "Dla początkujących"
 #    multiplayer: "Multiplayer"
     for_developers: "Dla developerów"
-#    javascript_blurb: "The language of the web. Great for writing websites, web apps, HTML5 games, and servers."
+    javascript_blurb: "Język internetu. Świetny do pisania stron, aplikacji internetowych, gier HTML5 i serwerów."
 #    python_blurb: "Simple yet powerful, Python is a great general purpose programming language."
 #    coffeescript_blurb: "Nicer JavaScript syntax."
 #    clojure_blurb: "A modern Lisp."
@@ -179,7 +179,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     new_password: "Nowe hasło"
     new_password_verify: "Zweryfikuj"
     email_subscriptions: "Powiadomienia email"
-#    email_subscriptions_none: "No Email Subscriptions."
+    email_subscriptions_none: "Brak powiadomień e-mail."
     email_announcements: "Ogłoszenia"
     email_announcements_description: "Otrzymuj powiadomienia o najnowszych wiadomościach i zmianach w CodeCombat."
     email_notifications: "Powiadomienia"
@@ -197,7 +197,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     error_saving: "Błąd zapisywania"
     saved: "Zmiany zapisane"
     password_mismatch: "Hasła róznią się od siebie"
-#    password_repeat: "Please repeat your password."
+    password_repeat: "Powtórz swoje hasło."
 #    job_profile: "Job Profile"
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
@@ -205,8 +205,8 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    view_profile: "View Your Profile"
 
   account_profile:
-#    settings: "Settings"
-#    edit_profile: "Edit Profile"
+    settings: "Ustawienia"
+    edit_profile: "Edytuj Profil"
 #    done_editing: "Done Editing"
     profile_for_prefix: "Profil"
     profile_for_suffix: ""
@@ -395,8 +395,8 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     hud_continue: "Kontynuuj (Shift + spacja)"
     spell_saved: "Czar zapisany"
     skip_tutorial: "Pomiń (esc)"
-#    keyboard_shortcuts: "Key Shortcuts"
-#    loading_ready: "Ready!"
+    keyboard_shortcuts: "Skróty klawiszowe"
+    loading_ready: "Gotowy!"
 #    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
 #    tip_toggle_play: "Toggle play/paused with Ctrl+P."
 #    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
@@ -404,7 +404,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -435,8 +435,8 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
   game_menu:
 #    inventory_tab: "Inventory"
 #    choose_hero_tab: "Restart Level"
-#    save_load_tab: "Save/Load"
-#    options_tab: "Options"
+    save_load_tab: "Zapisz/Wczytaj"
+    options_tab: "Opcje"
 #    guide_tab: "Guide"
     multiplayer_tab: "Multiplayer"
 #    inventory_caption: "Equip your hero"
@@ -458,10 +458,10 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 
   options:
 #    general_options: "General Options"
-#    music_label: "Music"
-#    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
+    music_label: "Muzyka"
+    music_description: "Wł/Wył muzykę w tle."
+    autorun_label: "Autostart"
+    autorun_description: "Ustawia automatyczne wykonywanie kodu."
     editor_config: "Konfiguracja edytora"
     editor_config_title: "Konfiguracja edytora"
 #    editor_config_level_language_label: "Language for This Level"
@@ -623,7 +623,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     results: "Wyniki"
     description: "Opis"
     or: "lub"
-#    subject: "Subject"
+    subject: "Temat"
     email: "Email"
     password: "Hasło"
     message: "Wiadomość"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/pt-BR.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/pt-PT.coffee

@@ -103,12 +103,12 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     for_beginners: "Para Iniciantes"
     multiplayer: "Multijogador"
     for_developers: "Para Programadores"
-#    javascript_blurb: "A linguagem da web. Ótima para escrever websites, aplicações da web, jogos HTML5 e servidores."
-#    python_blurb: "Simples mas poderoso, o Python é uma linguagem de programação ótima para propósitos gerais."
-#    coffeescript_blurb: "Sintaxe do Javascript mais agradável."
-#    clojure_blurb: "Um Lisp moderno"
-#    lua_blurb: "Linguagem para scripts de jogos"
-#    io_blurb: "Simples mas obscuro"
+    javascript_blurb: "A linguagem da web. Ótima para escrever websites, aplicações da web, jogos HTML5 e servidores."
+    python_blurb: "Simples mas poderoso, o Python é uma linguagem de programação ótima para propósitos gerais."
+    coffeescript_blurb: "Sintaxe do Javascript mais agradável."
+    clojure_blurb: "Um Lisp moderno"
+    lua_blurb: "Linguagem para scripts de jogos"
+    io_blurb: "Simples mas obscuro"
 
   play:
     choose_your_level: "Escolha o Seu Nível"
@@ -214,7 +214,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    not_featured: "Not Featured"
     looking_for: "À procura de:"
 #    last_updated: "Last updated:"
-#    contact: "Contact"
+    contact: "Contactar"
     active: "Estou à procura de ofertas de intrevistas agora"
     inactive: "Não estou à procura de ofertas neste momento"
 #    complete: "complete"
@@ -222,9 +222,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     next_city: "cidade?"
     next_country: "escolha o seu país."
     next_name: "nome?"
-#    next_short_description: "write a short description."
-#    next_long_description: "describe your desired position."
-#    next_skills: "list at least five skills."
+    next_short_description: "escreva uma pequena descrição."
+    next_long_description: "descreva a sua posição desejada."
+    next_skills: "liste, pelo menos, 5 habilidades."
 #    next_work: "chronicle your work history."
 #    next_education: "recount your educational ordeals."
 #    next_projects: "show off up to three projects you've worked on."
@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     tip_open_source: "O CodeCombat é 100% open source!"
     tip_beta_launch: "O CodeCombat lançou o seu beta em outubro de 2013."
     tip_js_beginning: "O JavaScript é apenas o começo."
-    think_solution: "Pense na solução, não no problema."
+    tip_think_solution: "Pense na solução, não no problema."
     tip_theory_practice: "Teoricamente, não há diferença entre a teoria e a prática. Mas na prática, há. - Yogi Berra"
     tip_error_free: "Há duas formas de escrever programas sem erros; apenas a terceira funciona. - Alan Perlis"
     tip_debugging_program: "Se depurar é o processo de remover erros, então programar deve ser o processo de os adicionar. - Edsger W. Dijkstra"
@@ -695,18 +695,18 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    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_title: "Código - 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"
+    mit_license_url: "licença do MIT"
 #    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_title: "Arte/Música - 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: "Música"
     art_sound: "Som"
     art_artwork: "Arte"
-#    art_sprites: "Sprites"
+    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:"
@@ -729,9 +729,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     page_title: "Contribuir"
     character_classes_title: "Classes das Personagens"
     introduction_desc_intro: "Temos esperanças elevadas para o 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_pref: "Queremos ser o sítio onde programadores de todo o tipo vêm para aprender e jogar juntos, introduzir outros ao maravilhoso mundo da programação e retratar as melhores partes da comunidade. Nós não podemos e não queremos fazer isso sozinhos; o que faz de projetos como o GitHub, o Stack Overflow e o Linux ótimos são as pessoas que os usam e constroem neles. Para isso, "
     introduction_desc_github_url: "o CodeCombat é totalmente 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_suf: " e queremos oferecer tantas maneiras quanto possível para que possa participar e fazer deste projeto tanto seu quanto nosso."
     introduction_desc_ending: "Esperamos que se junte a nós!"
     introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy e Matt"
     alert_account_message_intro: "Hey, você!"
@@ -743,12 +743,12 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    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: "Como Me Junto"
-#    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"
+    join_desc_1: "Qualquer um pode ajudar! Só tem de conferir o nosso "
+    join_desc_2: "para começar, e assinalar a caixa abaixo para se declarar um bravo Arcomago e receber as últimas nootícias por e-mail. Quer falar sobre o que fazer ou como se envolver mais profundamente no projeto? "
+    join_desc_3: " ou encontre-nos na nossa "
+    join_desc_4: "e começamos a partir daí!"
+    join_url_email: "Envie-nos um e-mail"
+    join_url_hipchat: "sala HipChat pública"
     more_about_archmage: "Aprenda Mais Sobre Tornar-se um Arcomago"
     archmage_subscribe_desc: "Receber e-mails relativos a novas oportunidades de programação e anúncios."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
@@ -758,11 +758,11 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    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."
+    artisan_join_desc: "Use o Editor de Níveis por esta ordem, pegar ou largar:"
+    artisan_join_step1: "Leia a documentação."
+    artisan_join_step2: "Crie um nível novo e explore níveis existentes."
+    artisan_join_step3: "Encontre-nos na nossa sala HipChat pública se necessitar de ajuda."
+    artisan_join_step4: "Coloque os seus níveis no fórum para receber feedback."
     more_about_artisan: "Aprenda Mais Sobre Tornar-se um Artesão"
     artisan_subscribe_desc: "Receber e-mails relativos a novidades do editor de níveis e anúncios."
 #    adventurer_summary: "Let us be clear about your role: you are the tank. You are going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class is for you."
@@ -780,8 +780,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    scribe_introduction_url_mozilla: "Mozilla Developer Network"
 #    scribe_introduction_suf: " has built. If your idea of fun is articulating the concepts of programming in Markdown form, then this class might be for you."
 #    scribe_attribute_1: "Skill in words is pretty much all you need. Not only grammar and spelling, but able to convey complicated ideas to others."
-#    contact_us_url: "Contact us"
-#    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!"
+    contact_us_url: "Contacte-nos"
+    scribe_join_description: "fale-nos um bocado de si, a sua experiência com a programação e o tipo de coisas sobre o qual gostava de escrever. Começamos a partir daí!"
     more_about_scribe: "Aprenda Mais Sobre Tornar-se um Escrivão"
     scribe_subscribe_desc: "Receber e-mails sobre anúncios relativos à escrita de artigos."
 #    diplomat_summary: "There is a large interest in CodeCombat in other countries that do not speak English! We are looking for translators who are willing to spend their time translating the site's corpus of words so that CodeCombat is accessible across the world as soon as possible. If you'd like to help getting CodeCombat international, then this class is for you."
@@ -789,9 +789,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    diplomat_launch_url: "launch in October"
 #    diplomat_introduction_suf: "it's that there is sizeable interest in CodeCombat in other countries! 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_github: "Find your language locale file "
-#    diplomat_github_url: "on GitHub"
-#    diplomat_join_suf_github: ", edit it online, and submit a pull request. Also, check this box below to keep up-to-date on new internationalization developments!"
+    diplomat_join_pref_github: "Encontre o ficheiro 'locale' do seu idioma "
+    diplomat_github_url: "no GitHub"
+    diplomat_join_suf_github: ", edite-o online e submeta um 'pull request'. Assinale ainda esta caixa abaixo para ficar atualizado em relação a novos desenvolvimentos da internacionalização!"
     more_about_diplomat: "Aprenda Mais Sobre Tornar-se um Diplomata"
     diplomat_subscribe_desc: "Receber e-mails sobre desenvolvimentos da i18n e níveis para traduzir."
 #    ambassador_summary: "We are trying to build a community, and every community needs a support team when there are troubles. We have got chats, emails, and social networks so that our users can get acquainted with the game. If you want to help people get involved, have fun, and learn some programming, then this class is for you."
@@ -846,13 +846,13 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     rank_my_game: "Classifique o Meu Jogo!"
     rank_submitting: "A submeter..."
     rank_submitted: "Submetido para Classificação"
-    rank_failed: "Falhou a Classificar"
+    rank_failed: "A Classificação Falhou"
     rank_being_ranked: "Jogo a ser Classificado"
-#    rank_last_submitted: "submitted "
+    rank_last_submitted: "submetido "
     help_simulate: "Ajudar a simular jogos?"
     code_being_simulated: "O seu novo código está a ser simulado por outros jogadores, para ser classificado. Isto será atualizado quando surgirem novas partidas."
     no_ranked_matches_pre: "Sem jogos classificados pela equipa "
-    no_ranked_matches_post: "! Joga contra alguns adversários e volta aqui para veres o teu jogo classificado."
+    no_ranked_matches_post: "! Jogue contra alguns adversários e volte aqui para ver o seu jogo classificado."
     choose_opponent: "Escolha um Adversário"
     select_your_language: "Selecione a sua linguagem!"
     tutorial_play: "Jogar Tutorial"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     tournament_ended: "O Torneio acabou"
     tournament_rules: "Regras do Torneio"
     tournament_blurb: "Escreva código, recolha ouro, construa exércitos, esmague inimigos, ganhe prémios e melhore a sua carreira no nosso torneio $40,000 Greed! Confira os detalhes"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
     tournament_blurb_blog: "no nosso blog"
     rules: "Regras"
     winners: "Vencedores"
@@ -914,16 +915,16 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
   resources:
     your_sessions: "As Suas Sessões"
     level: "Nível"
-#    social_network_apis: "Social Network APIs"
-#    facebook_status: "Facebook Status"
+    social_network_apis: "APIs das Redes Sociais"
+    facebook_status: "Estado do Facebook"
     facebook_friends: "Amigos do Facebook"
-#    facebook_friend_sessions: "Facebook Friend Sessions"
+    facebook_friend_sessions: "Sessões dos Amigos do Facebook"
     gplus_friends: "Amigos do Google+"
-#    gplus_friend_sessions: "G+ Friend Sessions"
+    gplus_friend_sessions: "Sessões dos Amigos do Google+"
     leaderboard: "Tabela de Classificação"
-#    user_schema: "User Schema"
-#    user_profile: "User Profile"
-#    patches: "Patches"
+    user_schema: "Esquema do Utilizador"
+    user_profile: "Perfil do Utilizador"
+    patches: "Atualizações"
     patched_model: "Documento Fonte"
     model: "Modelo"
     system: "Sistema"
@@ -937,13 +938,14 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     user_names: "Nomes de Utilizador"
     thang_names: "Nomes de Thangs"
     files: "Ficheiros"
-#    top_simulators: "Top Simulators"
+    top_simulators: "Melhores Simuladores"
     source_document: "Documento Fonte"
     document: "Documento"
-#    sprite_sheet: "Sprite Sheet"
-#    candidate_sessions: "Candidate Sessions"
-#    user_remark: "User Remark"
+    sprite_sheet: "Folha de Sprite"
+    candidate_sessions: "Sessões de Candidatos"
+    user_remark: "Observação do Utilizador"
     versions: "Versões"
+#    items: "Items"
 
   delta:
     added: "Adicionados/as"
@@ -954,37 +956,37 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     merge_conflict_with: "FUNDIR CONFLITO COM"
     no_changes: "Sem Alterações"
 
-#  user:
-#    stats: "Stats"
-#    singleplayer_title: "Singleplayer Levels"
-#    multiplayer_title: "Multiplayer Levels"
-#    achievements_title: "Achievements"
-#    last_played: "Last Played"
-#    status: "Status"
-#    status_completed: "Completed"
-#    status_unfinished: "Unfinished"
-#    no_singleplayer: "No Singleplayer games played yet."
-#    no_multiplayer: "No Multiplayer games played yet."
-#    no_achievements: "No Achievements earned yet."
-#    favorite_prefix: "Favorite language is "
-#    favorite_postfix: "."
+  user:
+    stats: "Estatísticas"
+    singleplayer_title: "Níveis Um Jogador"
+    multiplayer_title: "Níveis Multijogador"
+    achievements_title: "Conquistas"
+    last_played: "Última Vez Jogado"
+    status: "estado"
+    status_completed: "Completado"
+    status_unfinished: "Inacabado"
+    no_singleplayer: "Sem jogos Um Jogador jogados."
+    no_multiplayer: "Sem jogos Multijogador jogados."
+    no_achievements: "Sem Conquistas ganhas."
+    favorite_prefix: "Linguagem favorita é "
+    favorite_postfix: "."
 
-#  achievements:
-#    last_earned: "Last Earned"
-#    amount_achieved: "Amount"
-#    achievement: "Achievement"
-#    category_contributor: "Contributor"
-#    category_miscellaneous: "Miscellaneous"
-#    category_levels: "Levels"
-#    category_undefined: "Uncategorized"
-#    current_xp_prefix: ""
-#    current_xp_postfix: " in total"
-#    new_xp_prefix: ""
-#    new_xp_postfix: " earned"
-#    left_xp_prefix: ""
-#    left_xp_infix: " until level "
-#    left_xp_postfix: ""
+  achievements:
+    last_earned: "Último Ganho"
+    amount_achieved: "Quantidade"
+    achievement: "Conquista"
+    category_contributor: "Contribuidor"
+    category_miscellaneous: "Vários"
+    category_levels: "Níveis"
+    category_undefined: "Sem Categoria"
+    current_xp_prefix: ""
+    current_xp_postfix: " no total"
+    new_xp_prefix: ""
+    new_xp_postfix: " ganho"
+    left_xp_prefix: ""
+    left_xp_infix: " até ao nível "
+    left_xp_postfix: ""
 
-#  account:
-#    recently_played: "Recently Played"
-#    no_recent_games: "No games played during the past two weeks."
+  account:
+    recently_played: "Jogados Recentemente"
+    no_recent_games: "Sem jogos jogados nas passadas duas seemanas."

app/locale/pt.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/ro.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     tip_open_source: "CodeCombat este 100% open source!"
     tip_beta_launch: "CodeCombat a fost lansat beta in Octombrie 2013."
     tip_js_beginning: "JavaScript este doar începutul."
-    think_solution: "Gândește-te la soluție, nu la problemă."
+    tip_think_solution: "Gândește-te la soluție, nu la problemă."
     tip_theory_practice: "Teoretic nu este nici o diferență înte teorie și practică. Dar practic este. - Yogi Berra"
     tip_error_free: "Există doar două metode de a scrie un program fără erori; numai a treia funcționează. - Alan Perlis"
     tip_debugging_program: "Dacă a face debuggin este procesul de a scoate bug-uri, atunci a programa este procesul de a introduce bug-uri. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/ru.coffee

@@ -49,9 +49,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     blog: "Блог"
     forum: "Форум"
     account: "Аккаунт"
-#    profile: "Profile"
-#    stats: "Stats"
-#    code: "Code"
+    profile: "Профиль"
+    stats: "Характеристики"
+    code: "Код"
     admin: "Админ"
     home: "Домой"
     contribute: "Сотрудничество"
@@ -179,14 +179,14 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     new_password: "Новый пароль"
     new_password_verify: "Подтверждение пароля"
     email_subscriptions: "Email-подписки"
-#    email_subscriptions_none: "No Email Subscriptions."
+    email_subscriptions_none: "Нет активных подписок."
     email_announcements: "Оповещения"
     email_announcements_description: "Получать email-оповещения о последних новостях CodeCombat."
     email_notifications: "Уведомления"
     email_notifications_summary: "Настройки автоматических email-уведомлений, основанных на вашей активности на CodeCombat."
     email_any_notes: "Все уведомления"
     email_any_notes_description: "Отключите, чтобы больше не получать извещения."
-#    email_news: "News"
+    email_news: "Рассылка"
     email_recruit_notes: "Возможности для работы"
     email_recruit_notes_description: "Если вы действительно хорошо играете, то мы можем связаться с вами для предложения (лучшей) работы."
     contributor_emails: "Рассылки по классам участников"
@@ -234,20 +234,20 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     example_blog: "Блог"
     example_personal_site: "Персональный сайт"
     links_header: "Персональные ссылки"
-#    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
-#    links_name_help: "What are you linking to?"
-#    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
+    links_blurb: "Ссылки на другие сайты или профили, которые вы хотите указать Например: Аккаунт на GitHub'е, на LinkedIn'е, или на вашем блоге."
+    links_name: "Название ссылки"
+    links_name_help: "На что вы ссылаетесь?"
+    links_link_blurb: "URL ссылки"
+    basics_header: "Обновить базовую информацию."
 #    basics_active: "Open to Offers"
 #    basics_active_help: "Want interview offers right now?"
 #    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
+    basics_job_title_help: "Какую роль вы хотите?"
     basics_city: "Город"
-#    basics_city_help: "City you want to work in (or live in now)."
+    basics_city_help: "Город, в котором Вы живете или хотели ли бы работать."
     basics_country: "Страна"
 #    basics_country_help: "Country you want to work in (or live in now)."
-#    basics_visa: "US Work Status"
+    basics_visa: "Статус работы в США"
 #    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
 #    basics_looking_for: "Looking For"
     basics_looking_for_full_time: "Полная занятость"
@@ -311,18 +311,18 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 
   employers:
 #    hire_developers_not_credentials: "Hire developers, not credentials."
-#    get_started: "Get Started"
+    get_started: "Начнем"
 #    already_screened: "We've already technically screened all our candidates"
 #    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
+    filter_visa: "Visa"
 #    filter_visa_yes: "US Authorized"
 #    filter_visa_no: "Not Authorized"
 #    filter_education_top: "Top School"
 #    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
+    filter_role_web_developer: "Веб-разработчик"
 #    filter_role_software_developer: "Software Developer"
 #    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
+    filter_experience: "Опыт"
 #    filter_experience_senior: "Senior"
 #    filter_experience_junior: "Junior"
 #    filter_experience_recent_grad: "Recent Grad"
@@ -358,7 +358,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     grid: "Сетка"
     customize_wizard: "Настройки волшебника"
     home: "На главную"
-#    game_menu: "Game Menu"
+    game_menu: "Меню игры"
     guide: "Руководство"
     restart: "Перезапустить"
     goals: "Цели"
@@ -404,7 +404,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tip_open_source: "Исходный код CodeCombat открыт на 100%!"
     tip_beta_launch: "CodeCombat запустил бета-тестирование в октябре 2013 года."
     tip_js_beginning: "JavaScript это только начало."
-    think_solution: "Думайте о решении, а не о проблеме."
+    tip_think_solution: "Думайте о решении, а не о проблеме."
     tip_theory_practice: "В теории, между практикой и теорией нет разницы. Но на практике есть. - Yogi Berra"
     tip_error_free: "Есть два способа писать программы без ошибок; работает только третий. - Alan Perlis"
     tip_debugging_program: "Если отладка это процесс удаления багов, то программирование должно быть процессом их добавления. - Edsger W. Dijkstra"
@@ -480,13 +480,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     editor_config_behaviors_label: "Умное поведение"
     editor_config_behaviors_description: "Автозавершать квадратные, фигурные скобки и кавычки."
 
-#  guide:
-#    temp: "Temp"
+  guide:
+    temp: "Временный"
 
   multiplayer:
     multiplayer_title: "Настройки мультиплеера"
-#    multiplayer_toggle: "Enable multiplayer"
-#    multiplayer_toggle_description: "Allow others to join your game."
+    multiplayer_toggle: "Включить мультиплеер"
+    multiplayer_toggle_description: "Разрешить другим игрокам присоединяться к игре."
     multiplayer_link_description: "Дайте эту ссылку кому-нибудь, чтоб он присоединился к вам."
     multiplayer_hint_label: "Подсказка: "
     multiplayer_hint: "кликните на ссылку, чтобы выделить её, затем нажмите ⌘-С или Ctrl-C, чтобы скопировать."
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tournament_ended: "Турнир закончился"
     tournament_rules: "Правила турнира"
     tournament_blurb: "Пишите код, собирайте золото, стройте армию, крушите противников, получайте призы и улучшайте вашу карьеру в нашем \"$40,000 турнире жадности\"! Узнайте больше"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
     tournament_blurb_blog: "в нашем блоге"
     rules: "Правила"
     winners: "Победители"
@@ -932,7 +933,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    thang: "Thang"
 #    thangs: "Thangs"
     level_session: "Ваша сессия"
-#    opponent_session: "Opponent Session"
+    opponent_session: "Сессия противника"
     article: "Статья"
     user_names: "Никнеймы"
 #    thang_names: "Thang Names"
@@ -942,8 +943,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     document: "Документ"
 #    sprite_sheet: "Sprite Sheet"
 #    candidate_sessions: "Candidate Sessions"
-#    user_remark: "User Remark"
-#    versions: "Versions"
+    user_remark: "Пользовательские поправки"
+    versions: "Версии"
+#    items: "Items"
 
   delta:
     added: "Добавлено"
@@ -954,37 +956,37 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    merge_conflict_with: "MERGE CONFLICT WITH"
     no_changes: "Нет изменений"
 
-#  user:
-#    stats: "Stats"
-#    singleplayer_title: "Singleplayer Levels"
-#    multiplayer_title: "Multiplayer Levels"
-#    achievements_title: "Achievements"
-#    last_played: "Last Played"
-#    status: "Status"
-#    status_completed: "Completed"
-#    status_unfinished: "Unfinished"
-#    no_singleplayer: "No Singleplayer games played yet."
-#    no_multiplayer: "No Multiplayer games played yet."
-#    no_achievements: "No Achievements earned yet."
-#    favorite_prefix: "Favorite language is "
-#    favorite_postfix: "."
+  user:
+    stats: "Характеристики"
+    singleplayer_title: "Уровни одиночной игры"
+    multiplayer_title: "Уровни многопользовательской игры"
+    achievements_title: "Достижения"
+    last_played: "Последнее сыгранное"
+    status: "Статус"
+    status_completed: "Завершено"
+    status_unfinished: "Не завершено"
+    no_singleplayer: "Не сыграно ни одной одиночной игры."
+    no_multiplayer: "Не сыграно ни одной многопользовательской игры."
+    no_achievements: "Нет заработанных достижений."
+    favorite_prefix: "Предпочитаемый язык "
+    favorite_postfix: "."
 
-#  achievements:
-#    last_earned: "Last Earned"
-#    amount_achieved: "Amount"
-#    achievement: "Achievement"
-#    category_contributor: "Contributor"
-#    category_miscellaneous: "Miscellaneous"
-#    category_levels: "Levels"
-#    category_undefined: "Uncategorized"
-#    current_xp_prefix: ""
-#    current_xp_postfix: " in total"
-#    new_xp_prefix: ""
-#    new_xp_postfix: " earned"
-#    left_xp_prefix: ""
-#    left_xp_infix: " until level "
-#    left_xp_postfix: ""
+  achievements:
+    last_earned: "Последнее"
+    amount_achieved: "Количество"
+    achievement: "Достижение"
+    category_contributor: "Помощь"
+    category_miscellaneous: "Помощь"
+    category_levels: "Уровни"
+    category_undefined: "Неопределено"
+    current_xp_prefix: ""
+    current_xp_postfix: " в общем"
+    new_xp_prefix: ""
+    new_xp_postfix: " заработано"
+    left_xp_prefix: ""
+    left_xp_infix: " до уровня "
+    left_xp_postfix: ""
 
-#  account:
-#    recently_played: "Recently Played"
-#    no_recent_games: "No games played during the past two weeks."
+  account:
+    recently_played: "Недавно сыграно"
+    no_recent_games: "Нет сыгранных игр за последние две недели."

app/locale/sk.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/sl.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/sr.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/sv.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/th.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/tr.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/uk.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
     tip_open_source: "CodeCombat є 100% відкритим кодом!"
     tip_beta_launch: "CodeCombat запустив бета версію в жовтні 2013."
     tip_js_beginning: "JavaScript є лише початком."
-    think_solution: "Думайте про вирішення, а не за поблему."
+#    tip_think_solution: "Think of the solution, not the problem."
     tip_theory_practice: "В теорії між теорією і практикою немає ніякої різниці. На практиці - є. - Йогі Берра"
     tip_error_free: "Є два шляхи написання програм без помилок; але лише третій працює. - Алан Перліс"
     tip_debugging_program: "Якщо налагодження є процесом усунення помилок, то програмування повинно бути процесом їх вставляння. - Едсгер В. Дейкстра"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/ur.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/vi.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/zh-HANS.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_open_source: "CodeCombat 是 100% 开源的!"
     tip_beta_launch: "CodeCombat 开始于 2013的10月份."
     tip_js_beginning: "JavaScript 仅仅只是个开始."
-    think_solution: "思考解决方法, 而不是问题."
+    tip_think_solution: "思考解决方法, 而不是问题."
     tip_theory_practice: "在理论研究中，理论和实践之间是没有区别的。但在实践中，它们是有区别的。 - Yogi Berra"
     tip_error_free: "有两种方式可以写出没有错误的程序；但是只有第三种方式能让程序达到预期的效果。 - Alan Perlis"
     tip_debugging_program: "如果说调试是清除Bug的过程，那么编码就是放置Bug的过程。- Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/zh-HANT.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/zh-WUU-HANS.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/zh-WUU-HANT.coffee

@@ -404,7 +404,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     tip_open_source: "CodeCombat 是 百分百 開源個!"
     tip_beta_launch: "CodeCombat 從 2013年10月起。"
     tip_js_beginning: "JavaScript 只是起個頭。"
-    think_solution: "思考解決方法，勿是問題。"
+    tip_think_solution: "思考解決方法，勿是問題。"
     tip_theory_practice: "來理論研究裏向，理論搭實踐弗分個。不過徠實踐裏頭，渠裏是有分個。 - Yogi Berra"
     tip_error_free: "有兩種方式寫得出嘸錯個程序；不過佩只第三種方式好讓程序達到预期個效果。 - Alan Perlis"
     tip_debugging_program: "空是講調試是清理Bug個過程，箇勿編碼佩是囥Bug個過程。- Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/locale/zh.coffee

@@ -6,17 +6,17 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     send: "发送"
     cancel: "退出"
     save: "保存"
-#    publish: "Publish"
+    publish: "发布"
     create: "创建"
     delay_1_sec: "1 秒"
     delay_3_sec: "3 秒"
     delay_5_sec: "5 秒"
-#    manual: "Manual"
+    manual: "手册"
     fork: "Fork"
     play: "玩"
     retry: "重试"
-#    watch: "Watch"
-#    unwatch: "Unwatch"
+    watch: "关注"
+    unwatch: "取消关注"
     submit_patch: "提交补丁"
 
   units:
@@ -26,14 +26,14 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     minutes: "分"
     hour: "时"
     hours: "时"
-#    day: "day"
-#    days: "days"
-#    week: "week"
-#    weeks: "weeks"
-#    month: "month"
-#    months: "months"
-#    year: "year"
-#    years: "years"
+    day: "日"
+    days: "日"
+    week: "星期"
+    weeks: "星期"
+    month: "月"
+    months: "月"
+    year: "年"
+    years: "年"
 
   modal:
     close: "关闭"
@@ -49,9 +49,9 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     blog: "博客"
     forum: "论坛"
     account: "账号"
-#    profile: "Profile"
-#    stats: "Stats"
-#    code: "Code"
+    profile: "账户资料"
+    stats: "状态"
+    code: "编码"
     admin: "超级管理员"
     home: "首页"
     contribute: "贡献"
@@ -59,12 +59,12 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     about: "关于"
     contact: "联系我们"
     twitter_follow: "关注"
-#    employers: "Employers"
+    employers: "招募"
 
   versions:
     save_version_title: "保存新版本"
     new_major_version: "最新主要版本"
-    cla_prefix: "要保存更改, 首先你必须要统一我们的"
+    cla_prefix: "要保存更改, 首先你必须要同意我们的"
 #    cla_url: "CLA"
 #    cla_suffix: "."
     cla_agree: "我同意"
@@ -98,7 +98,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     no_mobile: "CodeCombat暂时没有手机版本，可能无法运行!"
     play: "玩"
     old_browser: "啊噢...你的浏览器太旧啦，CodeCombat无法运行了...抱歉！"
-#    old_browser_suffix: "You can try anyway, but it probably won't work."
+    old_browser_suffix: "你可以继续尝试下去，但是这种尝试八成没用的。。更新浏览器吧。"
 #    campaign: "Campaign"
 #    for_beginners: "For Beginners"
 #    multiplayer: "Multiplayer"
@@ -404,7 +404,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    tip_open_source: "CodeCombat is 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
 #    tip_js_beginning: "JavaScript is just the beginning."
-#    think_solution: "Think of the solution, not the problem."
+#    tip_think_solution: "Think of the solution, not the problem."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -874,6 +874,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    tournament_ended: "Tournament ended"
 #    tournament_rules: "Tournament Rules"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
+#    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
 #    tournament_blurb_blog: "on our blog"
 #    rules: "Rules"
 #    winners: "Winners"
@@ -944,6 +945,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    candidate_sessions: "Candidate Sessions"
 #    user_remark: "User Remark"
 #    versions: "Versions"
+#    items: "Items"
 
 #  delta:
 #    added: "Added"

app/templates/game-menu/options-view.jade

@@ -22,7 +22,7 @@
     span.help-block(data-i18n="options.music_description") Turn background music on/off.
 
   .form-group.select-group
-    label.control-label(for="option-autorun-delay", data-i18n="options.autorun") Autorun
+    label.control-label(for="option-autorun-delay", data-i18n="options.autorun_label") Autorun
     select#option-autorun-delay(name="autorunDelay")
       option(value=1000, selected=(autorunDelay === 1000), data-i18n="common.delay_1_sec") 1 second
       option(value=3000, selected=(autorunDelay === 3000), data-i18n="common.delay_3_sec") 3 seconds

app/views/editor/ForkModal.coffee

@@ -18,7 +18,8 @@ module.exports = class ForkModal extends ModalView
     @model = options.model
     @modelClass = @model.constructor
 
-  forkModel: ->
+  forkModel: (e) ->
+    e.preventDefault()
     @showLoading()
     forms.clearFormAlerts(@$el)
     newModel = new @modelClass($.extend(true, {}, @model.attributes))

app/views/editor/level/modals/SaveLevelModal.coffee

@@ -56,7 +56,8 @@ module.exports = class SaveLevelModal extends SaveVersionModal
     # Sometimes we have two versions: one in a search collection and one with a URL. We only save changes to the latter.
     false
 
-  commitLevel: ->
+  commitLevel: (e) ->
+    e.preventDefault()
     modelsToSave = []
     formsToSave = []
     for form in @$el.find('form')

app/views/modal/SaveVersionModal.coffee

@@ -11,11 +11,11 @@ module.exports = class SaveVersionModal extends ModalView
   modalWidthPercent: 60
 
   events:
-    'click #save-version-button': 'onClickSaveButton'
+    'click #save-version-button': 'saveChanges'
     'click #cla-link': 'onClickCLALink'
     'click #agreement-button': 'onAgreedToCLA'
     'click #submit-patch-button': 'submitPatch'
-    'submit form': 'submitPatch'
+    'submit form': 'onSubmitForm'
 
   constructor: (options) ->
     super options
@@ -40,7 +40,11 @@ module.exports = class SaveVersionModal extends ModalView
         console.error 'Couldn\'t create delta view:', e
     @$el.find('.commit-message input').attr('placeholder', $.i18n.t('general.commit_msg'))
 
-  onClickSaveButton: ->
+  onSubmitForm: (e) ->
+    e.preventDefault()
+    if @isPatch then @submitPatch() else @saveChanges()
+  
+  saveChanges: ->
     Backbone.Mediator.publish 'save-new-version', {
       major: @$el.find('#major-version').prop('checked')
       commitMessage: @$el.find('#commit-message').val()

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

@@ -121,7 +121,7 @@ module.exports = class TomeView extends CocoView
         spellKey = pathComponents.join '/'
         @thangSpells[thang.id].push spellKey
         unless method.cloneOf
-          skipProtectAPI = @getQueryVariable 'skip_protect_api', (@options.levelID in ['gridmancer'])
+          skipProtectAPI = @getQueryVariable 'skip_protect_api', (@options.levelID in ['gridmancer', 'minimax-tic-tac-toe'])
           spell = @spells[spellKey] = new Spell
             programmableMethod: method
             spellKey: spellKey

server/commons/Handler.coffee

@@ -8,7 +8,7 @@ User = require '../users/User'
 sendwithus = require '../sendwithus'
 
 PROJECT = {original: 1, name: 1, version: 1, description: 1, slug: 1, kind: 1}
-FETCH_LIMIT = 200
+FETCH_LIMIT = 300
 
 module.exports = class Handler
   # subclasses should override these properties