Merge pull request #1 from codecombat/master

updating my repo

app/assets/main.html

@@ -48,18 +48,20 @@
 
   <!-- Inspectlet -->
   <script type="text/javascript" id="inspectletjs">
-  	window.__insp = window.__insp || [];
-  	__insp.push(['wid', 2102699786]);
-  	(function() {
-  		function __ldinsp(){var insp = document.createElement('script'); insp.type = 'text/javascript'; insp.async = true; insp.id = "inspsync"; insp.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://cdn.inspectlet.com/inspectlet.js'; var x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(insp, x); }
-  		if (window.attachEvent){
-  			window.attachEvent('onload', __ldinsp);
-  		}else{
-  			window.addEventListener('load', __ldinsp, false);
-  		}
-  	})();
+    window.__insp = window.__insp || [];
+    __insp.push(['wid', 2102699786]);
+    (function() {
+      function __ldinsp(){var insp = document.createElement('script'); insp.type = 'text/javascript'; insp.async = true; insp.id = "inspsync"; insp.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://cdn.inspectlet.com/inspectlet.js'; var x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(insp, x); }
+      if (window.attachEvent){
+        window.attachEvent('onload', __ldinsp);
+      }else{
+        window.addEventListener('load', __ldinsp, false);
+      }
+    })();
   </script>
 
+  <script src="https://checkout.stripe.com/checkout.js"></script>
+
   <!-- IE9 doesn't support defer attribute: https://github.com/h5bp/lazyweb-requests/issues/42 -->
   <!--[if IE 9]>
   <script src="/lib/ace/ace.js"></script>

app/core/Router.coffee

@@ -92,6 +92,8 @@ module.exports = class CocoRouter extends Backbone.Router
     'i18n/campaign/:handle': go('i18n/I18NEditCampaignView')
     'i18n/poll/:handle': go('i18n/I18NEditPollView')
 
+    'identify': go('user/IdentifyView')
+
     'legal': go('LegalView')
 
     'multiplayer': go('MultiplayerView')

app/core/Tracker.coffee

@@ -100,7 +100,7 @@ module.exports = class Tracker
         eventObject["user"] = me.id
         dataToSend = JSON.stringify eventObject
         # console.log dataToSend if debugAnalytics
-        $.post("http://analytics.codecombat.com/analytics", dataToSend).fail ->
+        $.post("#{window.location.protocol or 'http:'}//analytics.codecombat.com/analytics", dataToSend).fail ->
           console.error "Analytics post failed!"
       else
         request = @supermodel.addRequestResource 'log_event', {

app/core/contact.coffee

@@ -1,6 +1,7 @@
 module.exports.sendContactMessage = (contactMessageObject, modal) ->
-  modal.find('.sending-indicator').show()
+  modal?.find('.sending-indicator').show()
   jqxhr = $.post '/contact', contactMessageObject, (response) ->
+    return unless modal
     modal.find('.sending-indicator').hide()
     modal.find('#contact-message').val('Thanks!')
     _.delay ->

app/core/social-handlers/GPlusHandler.coffee

@@ -19,7 +19,7 @@ scope = 'https://www.googleapis.com/auth/plus.login email'
 
 module.exports = GPlusHandler = class GPlusHandler extends CocoClass
   constructor: ->
-    @accessToken = storage.load GPLUS_TOKEN_KEY
+    @accessToken = storage.load GPLUS_TOKEN_KEY, false
     super()
 
   subscriptions:
@@ -53,7 +53,7 @@ module.exports = GPlusHandler = class GPlusHandler extends CocoClass
     try
       # Without removing this, we sometimes get a cross-domain error
       d = _.omit(e, 'g-oauth-window')
-      storage.save(GPLUS_TOKEN_KEY, d)
+      storage.save(GPLUS_TOKEN_KEY, d, 0)
     catch e
       console.error 'Unable to save G+ token key', e
     @accessToken = e

app/core/storage.coffee

@@ -1,4 +1,6 @@
-module.exports.load = (key) ->
+# Pass false for fromCache to fetch keys that have been stored outside of lscache.
+module.exports.load = (key, fromCache=true) ->
+  return lscache.get key if fromCache
   s = localStorage.getItem(key)
   return null unless s
   try
@@ -8,8 +10,17 @@ module.exports.load = (key) ->
     console.warn('error loading from storage', key)
     return null
 
-module.exports.save = (key, value) ->
-  s = JSON.stringify(value)
-  localStorage.setItem(key, s)
+# Pass 0 for expirationInMinutes to persist it as long as possible outside of lscache expiration.
+module.exports.save = (key, value, expirationInMinutes) ->
+  expirationInMinutes ?= 7 * 24 * 60
+  if expirationInMinutes
+    lscache.set key, value, expirationInMinutes
+  else
+    localStorage.setItem key, JSON.stringify(value)
 
-module.exports.remove = (key) -> localStorage.removeItem key
+# Pass false for fromCache to remove keys that have been stored outside of lscache.
+module.exports.remove = (key, fromCache=true) ->
+  if fromCache
+    lscache.remove key
+  else
+    localStorage.removeItem key

app/lib/Angel.coffee

@@ -5,6 +5,9 @@
 World = require 'lib/world/world'
 CocoClass = require 'core/CocoClass'
 GoalManager = require 'lib/world/GoalManager'
+{sendContactMessage} = require 'core/contact'
+
+reportedLoadErrorAlready = false
 
 module.exports = class Angel extends CocoClass
   @nicks: ['Archer', 'Lana', 'Cyril', 'Pam', 'Cheryl', 'Woodhouse', 'Ray', 'Krieger']
@@ -16,6 +19,7 @@ module.exports = class Angel extends CocoClass
   subscriptions:
     'level:flag-updated': 'onFlagEvent'
     'playback:stop-real-time-playback': 'onStopRealTimePlayback'
+    'level:escape-pressed': 'onEscapePressed'
 
   constructor: (@shared) ->
     super()
@@ -29,6 +33,7 @@ module.exports = class Angel extends CocoClass
       @abortTimeoutDuration *= 10
     @initialized = false
     @running = false
+    @allLogs = []
     @hireWorker()
     @shared.angels.push @
 
@@ -43,11 +48,12 @@ module.exports = class Angel extends CocoClass
   # say: debugging stuff, usually off; log: important performance indicators, keep on
   say: (args...) -> #@log args...
   log: ->
-    # console.info.apply is undefined in IE9, CofeeScript splats invocation won't work.
+    # console.info.apply is undefined in IE9, CoffeeScript splats invocation won't work.
     # http://stackoverflow.com/questions/5472938/does-ie9-support-console-log-and-is-it-a-real-function
     message = "|#{@shared.godNick}'s #{@nick}|"
     message += " #{arg}" for arg in arguments
     console.info message
+    @allLogs.push message
 
   testWorker: =>
     return if @destroyed
@@ -85,7 +91,7 @@ module.exports = class Angel extends CocoClass
       when 'non-user-code-problem'
         Backbone.Mediator.publish 'god:non-user-code-problem', problem: event.data.problem
         if @shared.firstWorld
-          @infinitelyLooped()  # For now, this should do roughly the right thing if it happens during load.
+          @infinitelyLooped(false, true)  # For now, this should do roughly the right thing if it happens during load.
         else
           @fireWorker()
 
@@ -165,14 +171,28 @@ module.exports = class Angel extends CocoClass
     @worker.postMessage func: 'finalizePreload'
     @work.preload = false
 
-  infinitelyLooped: =>
+  infinitelyLooped: (escaped=false, nonUserCodeProblem=false) =>
     @say 'On infinitely looped! Aborting?', @aborting
     return if @aborting
     problem = type: 'runtime', level: 'error', id: 'runtime_InfiniteLoop', message: 'Code never finished. It\'s either really slow or has an infinite loop.'
+    problem.message = 'Escape pressed; code aborted.' if escaped
     Backbone.Mediator.publish 'god:user-code-problem', problem: problem
-    Backbone.Mediator.publish 'god:infinite-loop', firstWorld: @shared.firstWorld
+    Backbone.Mediator.publish 'god:infinite-loop', firstWorld: @shared.firstWorld, nonUserCodeProblem: nonUserCodeProblem
+    @reportLoadError() if nonUserCodeProblem
     @fireWorker()
 
+  reportLoadError: ->
+    return if me.isAdmin() or /dev=true/.test(window.location?.href ? '') or reportedLoadErrorAlready
+    reportedLoadErrorAlready = true
+    context = email: me.get('email')
+    context.message = "Automatic Report - Unable to Load Level\nLogs:\n" + @allLogs.join('\n')
+    if $.browser
+      context.browser = "#{$.browser.platform} #{$.browser.name} #{$.browser.versionNumber}"
+    context.screenSize = "#{screen?.width ? $(window).width()} x #{screen?.height ? $(window).height()}"
+    context.subject = "Level Load Error: #{@work?.level?.name or 'Unknown Level'}"
+    context.levelSlug = @work?.level?.slug
+    sendContactMessage context
+
   doWork: ->
     return if @aborting
     return @say 'Not initialized for work yet.' unless @initialized
@@ -239,8 +259,14 @@ module.exports = class Angel extends CocoClass
   onStopRealTimePlayback: (e) ->
     return unless @running and @work.realTime
     @work.realTime = false
+    @lastRealTimeWork = new Date()
     @worker.postMessage func: 'stopRealTimePlayback'
 
+  onEscapePressed: (e) ->
+    return unless @running and not @work.realTime
+    return if (new Date() - @lastRealTimeWork) < 1000  # Fires right after onStopRealTimePlayback
+    @infinitelyLooped true
+
   #### Synchronous code for running worlds on main thread (profiling / IE9) ####
   simulateSync: (work) =>
     console?.profile? "World Generation #{(Math.random() * 1000).toFixed(0)}" if imitateIE9?

app/lib/world/names.coffee

@@ -1,6 +1,7 @@
 module.exports.thangNames = thangNames =
   'Ogre Munchkin F': [
     # Female
+    'Anabel'
     'Dosha'
     'Gurzunn'
     'Hoot'
@@ -8,6 +9,7 @@ module.exports.thangNames = thangNames =
     'Iyert'
     'Lacos'
     'Palt'
+    'Paulark'
     'Pripp'
     'Shmeal'
     'Upfish'
@@ -19,9 +21,11 @@ module.exports.thangNames = thangNames =
     'Brack'
     'Dobo'
     'Draff'
+    'Eugen'
     'Gert'
     'Godel'
     'Goreball'
+    'Toremon'
     'Gort'
     'Kog'
     'Kogpole'
@@ -74,10 +78,12 @@ module.exports.thangNames = thangNames =
     'Celadia'
     'Taric'
     'Vaelia'
+    'Antary'
   ]
   'Ogre Witch': [
     # Female
     'Vyrryx'
+    'Yzzrith'
   ]
   'Ogre Chieftain': [
     # Female
@@ -86,6 +92,7 @@ module.exports.thangNames = thangNames =
   ]
   'Ogre Warlock': [
     # Male
+    'Vax'
     'Vyrryx'
   ]
   'Ogre Scout M': [
@@ -127,6 +134,7 @@ module.exports.thangNames = thangNames =
     # Animal
     'Kitty'
     'Shasta'
+    'Simbia'
   ]
   'Frog': [
     # Animal
@@ -143,6 +151,7 @@ module.exports.thangNames = thangNames =
     'Mr. Toad'
     'Trevor'
     'Wei Qi'
+    'Toada'
   ]
   'Horse': [
     # Animal
@@ -154,6 +163,8 @@ module.exports.thangNames = thangNames =
     'Beauty'
     'Lovelace'
     'Mirial'
+    'Miracle'
+    'Codasus'
   ]
   'Ogre M': [
     # Male
@@ -180,6 +191,7 @@ module.exports.thangNames = thangNames =
     'Trogdor'
     'Trung'
     'Vargutt'
+    'Demonik'
   ]
   'Ogre F': [
     # Female
@@ -194,6 +206,7 @@ module.exports.thangNames = thangNames =
     'Martha'
     'Morthrug'
     'Nareng'
+    'Maleda'
   ]
   'Ogre Brawler': [
     # Male
@@ -295,6 +308,7 @@ module.exports.thangNames = thangNames =
     'Talus'
     'Ulna'
     'Yorick'
+    'Boneus'
   ]
   'Ogre Headhunter': [
     # Male
@@ -321,6 +335,7 @@ module.exports.thangNames = thangNames =
     # Female
     'Naria'
     'Sylva'
+    'Archia'
   ]
   'Raider': [
     # Female
@@ -333,10 +348,12 @@ module.exports.thangNames = thangNames =
   'Guardian': [
     # Female
     'Illia'
+    'Gaia'
   ]
   'Pixie': [
     # Female
     'Zana'
+    'Eika'
   ]
   'Assassin': [
     # Male
@@ -347,11 +364,13 @@ module.exports.thangNames = thangNames =
     'Shade'
     'Talon'
     'Zed'
+    'Sherkey'
   ]
   'Necromancer': [
     # Male
     'Morcelu'
     'Nalfar'
+    'Drezhul'
   ]
   'Dark Wizard': [
     # Female
@@ -837,6 +856,7 @@ module.exports.thangNames = thangNames =
     'Altair'
     'Arthur'
     'Bertrand'
+    'Bronn'
     'Bruce'
     'Drake'
     'Duran'
@@ -845,6 +865,7 @@ module.exports.thangNames = thangNames =
     'Hank'
     'Hunfray'
     'Jeph'
+    'Jorah'
     'Lancelot'
     'Mace'
     'Neville'

app/lib/world/vector.coffee

@@ -111,10 +111,9 @@ class Vector
   invalid: () ->
     return (@x is Infinity) || isNaN(@x) || @y is Infinity || isNaN(@y) || @z is Infinity || isNaN(@z)
 
-  toString: (useZ) ->
-    useZ = true
-    return "{x: #{@x.toFixed(0)}, y: #{@y.toFixed(0)}, z: #{@z.toFixed(0)}}" if useZ
-    return "{x: #{@x.toFixed(0)}, y: #{@y.toFixed(0)}}"
+  toString: (precision = 2) ->
+    return "{x: #{@x.toFixed(precision)}, y: #{@y.toFixed(precision)}, z: #{@z.toFixed(precision)}}"
+
 
   serialize: ->
     {CN: @constructor.className, x: @x, y: @y, z: @z}

app/lib/world/world.coffee

@@ -70,9 +70,9 @@ module.exports = class World
   setThang: (thang) ->
     thang.stateChanged = true
     for old, i in @thangs
-      console.error 'world trying to set', thang, 'over', old unless old? and thang?
       if old.id is thang.id
         @thangs[i] = thang
+        break
     @thangMap[thang.id] = thang
 
   thangDialogueSounds: (startFrame=0) ->
@@ -102,7 +102,9 @@ module.exports = class World
     if @realTime and not @countdownFinished
       @realTimeSpeedFactor = 1
       unless @showsCountdown
-        if @levelID in ['village-guard', 'thornbush-farm', 'back-to-back', 'ogre-encampment', 'woodland-cleaver', 'shield-rush', 'peasant-protection', 'munchkin-swarm', 'munchkin-harvest', 'swift-dagger', 'shrapnel', 'arcane-ally', 'touch-of-death', 'bonemender']
+        if @levelID in ['woodland-cleaver', 'village-guard', 'shield-rush']
+          @realTimeSpeedFactor = 2
+        else if @levelID in ['thornbush-farm', 'back-to-back', 'ogre-encampment', 'peasant-protection', 'munchkin-swarm', 'munchkin-harvest', 'swift-dagger', 'shrapnel', 'arcane-ally', 'touch-of-death', 'bonemender']
           @realTimeSpeedFactor = 3
       if @showsCountdown
         return setTimeout @finishCountdown(continueLaterFn), REAL_TIME_COUNTDOWN_DELAY
@@ -608,5 +610,5 @@ module.exports = class World
     time: @age
     'damage-taken': @getSystem('Combat')?.damageTakenForTeam 'humans'
     'damage-dealt': @getSystem('Combat')?.damageDealtForTeam 'humans'
-    'gold-collected': @getSystem('Inventory')?.teamGold.humans?.earned
+    'gold-collected': @getSystem('Inventory')?.teamGold.humans?.collected
     'difficulty': @difficulty

app/locale/ar.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     anonymous: "لاعب مجهول"
     level_difficulty: "الصعوبة:"
     campaign_beginner: "حملة المبتدئين"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
     adjust_volume: "تعديل الصوت"
@@ -177,7 +177,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     version_history_for: "تاريخ النسخة لل: "
     select_changes: "اختر تغيريين."
 #    undo_prefix: "Undo"
-#    undo_shortcut: "(Ctrl+z)"
+#    undo_shortcut: "(Ctrl+Z)"
 #    redo_prefix: "Redo"
 #    redo_shortcut: "(Ctrl+Shift+Z)"
     play_preview: "شاهد مقطع فيديو عن المستوى الحالي"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -477,7 +479,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     io_blurb: "بسيطة ولكنها غامضة."
 #    status: "Status"
 #    hero_type: "Type"
-#    weapons: "Weapons"
+    weapons: "اسلحة"
 #    weapons_warrior: "Swords - Short Range, No Magic"
 #    weapons_ranger: "Crossbows, Guns - Long Range, No Magic"
 #    weapons_wizard: "Wands, Staffs - Long Range, Magic"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/bg.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "български език", englishDescri
     anonymous: "Анонимен играч"
     level_difficulty: "Трудност"
     campaign_beginner: "Кампания за начинаещи"
-    awaiting_levels_adventurer_prefix: "5 нови нива всяка седмица"
+    awaiting_levels_adventurer_prefix: "5 нови нива всяка седмица" # {change}
     awaiting_levels_adventurer: "Стани Приключенец"
     awaiting_levels_adventurer_suffix: "за да бъдеш първият, който играе нови нива."
     adjust_volume: "Настрой звук"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "български език", englishDescri
     victory_hour_of_code_done_yes: "Да аз съм готов с моят Hour of Code™!"
     victory_experience_gained: "Спечелен опит"
     victory_gems_gained: "Спечелени скъпоценни камъни"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Упътване"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "български език", englishDescri
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "български език", englishDescri
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "български език", englishDescri
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "български език", englishDescri
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/ca.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     anonymous: "Jugador anònim"
     level_difficulty: "Dificultat: "
     campaign_beginner: "Campanya del principiant"
-    awaiting_levels_adventurer_prefix: "Fem cinc nivells per setmana"
+    awaiting_levels_adventurer_prefix: "Fem cinc nivells per setmana" # {change}
     awaiting_levels_adventurer: "Inicia sessió com aventurer"
     awaiting_levels_adventurer_suffix: "sigues el primer en jugar els nous nivells"
     adjust_volume: "Ajustar volum"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     victory_hour_of_code_done_yes: "Sí, He acabat amb la meva Hora de Codi™!"
     victory_experience_gained: "XP Guanyada"
     victory_gems_gained: "Gemmes guanyades"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Guia"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
     feature1: "60+ nivells bàsics a traves de 4 móns" # {change}
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
     feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Gratuit"
 #    month: "month"
     subscribe_title: "Subscriu-te"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     volume_label: "Volum"
     music_label: "Musica"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    nick_blurb: "Motivation Guru"
     michael_title: "Programador"
 #    michael_blurb: "Sys Admin"
-    matt_title: "Programador"
+    matt_title: "Programador" # {change}
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/cs.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     anonymous: "Anonymní hráč"
     level_difficulty: "Obtížnost: "
     campaign_beginner: "Začátečnická kampaň"
-    awaiting_levels_adventurer_prefix: "Vypouštíme pět úrovní každý týden."
+    awaiting_levels_adventurer_prefix: "Vypouštíme pět úrovní každý týden." # {change}
     awaiting_levels_adventurer: "Přihlašte se jako Dobrodruh"
     awaiting_levels_adventurer_suffix: "abyste jako první hráli nejnovější úrovně."
     adjust_volume: "Nastavení hlasitosti"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     victory_hour_of_code_done_yes: "Ano, pro dnešek jsem skončil!"
     victory_experience_gained: "Získáno zkušeností"
     victory_gems_gained: "Získáno drahokamů"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Průvodce"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     feature4: "<strong>3500 bonusových drahokamů</strong> každý měsíc!"
     feature5: "Video tutoriály"
     feature6: "Premiová e-mailová podpora"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Zdarma"
     month: "měsíc"
     subscribe_title: "Předplatné"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     parent_email_title: "Jaký je e-mail tvých rodičů?"
     parents: "Pro rodiče"
     parents_title: "Vaše dítě se naučí programovat." # {change}
-    parents_blurb1: "Pomocí CodeCombat se vaše dítě učí psaním opravdového kódu. Začínají učením se základním příkazů a postupně se přidávají pokročilejší témata." # {change}
+    parents_blurb1: "Pomocí CodeCombat se vaše dítě učí psaním opravdového kódu. Začínají učením se základním příkazů a postupně se přidávají pokročilejší témata."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "Za $9.99 USD/měsíc, získají nové výzvy každý týden a osobní emailovou podporu od profesionálních programátorů." # {change}
     parents_blurb3: "Bez rizika: 100% záruka vrácení peněz, jednoduché zrušení předplatného na 1 kliknutí."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     volume_label: "Hlasitost"
     music_label: "Hudba"
     music_description: "Vypnout/zapnout hudbu v pozadí."
-    autorun_label: "Autospuštění"
-    autorun_description: "Ovládat automatické spuštění kóduControl automatic code execution."
     editor_config: "Konfigurovat editor"
     editor_config_title: "Konfigurace editoru"
     editor_config_level_language_label: "Jazyky pro tuto úroveň"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     nick_blurb: "Motivační guru"
     michael_title: "Programátor"
     michael_blurb: "Systémový administrátor"
-    matt_title: "Programátor"
+    matt_title: "Programátor" # {change}
     matt_blurb: "Cyklista"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/da.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    anonymous: "Anonymous Player"
     level_difficulty: "Sværhedsgrad: "
     campaign_beginner: "Begynderkampagne"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     victory_hour_of_code_done_yes: "Ja, jeg er færdig med min Kodetime!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Instruktioner"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/de-AT.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     anonymous: "Anonymer Spieler"
     level_difficulty: "Schwierigkeit: "
     campaign_beginner: "Anfängerkampagne"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     victory_hour_of_code_done_yes: "Ja, ich bin mit meiner Code-Stunde fertig!"
     victory_experience_gained: "EP erhalten"
     victory_gems_gained: "Juwelen erhalten"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Anleitung"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     volume_label: "Lautstärke"
     music_label: "Musik"
     music_description: "Schalte Hintergrundmusik an/aus."
-    autorun_label: "Autorun"
-    autorun_description: "Steuere automatische Programmausführung."
     editor_config: "Editor Einstellungen"
     editor_config_title: "Editor Einstellungen"
     editor_config_level_language_label: "Sprache für dieses Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     nick_blurb: "Motivationsguru"
     michael_title: "Programmierer"
     michael_blurb: "Sys Admin"
-    matt_title: "Programmierer"
+    matt_title: "Programmierer" # {change}
     matt_blurb: "Radfahrer"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/de-CH.coffee

@@ -1,6 +1,6 @@
-module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "German (Switzerland)", translation:
+module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "German (Switzerland)", translation:
   home:
-    slogan: "Lern, wiemer JavaScript programmiert, indem du es Spiel spielsch!"
+    slogan: "Lern, wiemer JavaScript programmiert, indem du spielsch!"
     no_ie: "CodeCombat funktioniert uf InternetExplorer 8 und älter nid. Sorry!" # Warning that only shows up in IE8 and older
     no_mobile: "CodeCombat isch nid für mobili Grät entwicklet worde und funktioniert vilicht nid!" # Warning that shows up on mobile devices
     play: "Spiele" # The big play button that opens up the campaign view.
@@ -56,28 +56,28 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     unlock: "Freischalte" # For purchasing items and heroes
     confirm: "Bestätige"
     owned: "Scho gkauft" # For items you own
-    locked: "Nonig freischaltbar"
-#    purchasable: "Purchasable" # For a hero you unlocked but haven't purchased
+    locked: "Nonig kauft"
+    purchasable: "kaufen" # For a hero you unlocked but haven't purchased
     available: "vorhandä"
-#    skills_granted: "Skills Granted" # Property documentation details
+    skills_granted: "Fähigkeite" # Property documentation details
     heroes: "Helde" # Tooltip on hero shop button from /play
-    achievements: "Achievements" # Tooltip on achievement list button from /play
+    achievements: "Erfolg" # Tooltip on achievement list button from /play
     account: "Account" # Tooltip on account button from /play
     settings: "Istellige" # Tooltip on settings button from /play
-#    poll: "Poll" # Tooltip on poll button from /play
+    poll: "Pool" # Tooltip on poll button from /play
     next: "Wiiter" # Go from choose hero to choose inventory before playing a level
     change_hero: "Held wächsle" # Go back from choose inventory to choose hero
-#    choose_inventory: "Equip Items"
-#    buy_gems: "Buy Gems"
-#    subscription_required: "Subscription Required"
+    choose_inventory: "Items uusrüschte"
+    buy_gems: "Edelstei chaufä"
+    subscription_required: "Abonnement benötigt"
     older_campaigns: "Älteri Kampagne"
     anonymous: "Anonyme Spieler"
     level_difficulty: "Schwierigkeit: "
     campaign_beginner: "Afängerkampagne"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
-#    awaiting_levels_adventurer: "Sign up as an Adventurer"
-#    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
-#    adjust_volume: "Adjust volume"
+    awaiting_levels_adventurer_prefix: "Mier möched 5 Levels pro Wuche" # {change}
+    awaiting_levels_adventurer: "Mäld dich a as en Abendtüürer"
+    awaiting_levels_adventurer_suffix: "um de erscht zii vo die neue Levels spiilt"
+    adjust_volume: "Luutsterchi apasse"
     choose_your_level: "Wähl dis Level us" # The rest of this section is the old play view at /play-old and isn't very important.
     adventurer_prefix: "Du chasch zu de untere Level zrugg goh oder die kommende Level diskutiere im "
     adventurer_forum: "Abentürer-Forum"
@@ -90,16 +90,16 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     campaign_multiplayer_description: "... i dene du Chopf a Chopf geg anderi Spieler spielsch."
     campaign_player_created: "Vo Spieler erstellti Level"
     campaign_player_created_description: "... i dene du gege d Kreativität vome <a href=\"/contribute#artisan\">Handwerker Zauberer</a> kämpfsch."
-#    campaign_classic_algorithms: "Classic Algorithms"
-#    campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science."
+    campaign_classic_algorithms: "Klassischi Algorithme"
+    campaign_classic_algorithms_description: "... wo du die beliebtischte Algorithmue vode Computer Welt lernsch.."
 
   share_progress_modal:
     blurb: "Du machsch grossi Fortschritts! Verzells öperem wieviel du glernt häsch mit CodeCombat."
     email_invalid: "Email Adrässä isch falsch."
-#    form_blurb: "Enter your parent's email below and we’ll show them!"
+    form_blurb: "Gib bitte dEmail Adrässe vo dine Eltere aa"
     form_label: "Email Adrässä"
     placeholder: "Email Adrässä"
-#    title: "Excellent Work, Apprentice"
+    title: "Gueti Arbeit!"
 
   login:
     sign_up: "Account erstelle"
@@ -107,8 +107,8 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     logging_in: "Am Ilogge"
     log_out: "Uslogge"
     forgot_password: "Passwort vergässe?"
-#    authenticate_gplus: "Authenticate G+"
-#    load_profile: "Load G+ Profile"
+    authenticate_gplus: "Mit G+ audentifiziere"
+    load_profile: "G+ Profil ladä"
     finishing: "Fertigstelle"
     sign_in_with_facebook: "Mit Facebook aamelde"
     sign_in_with_gplus: "Mit G+ aamelde"
@@ -125,20 +125,20 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 
   recover:
     recover_account_title: "Account wiederherstelle"
-    send_password: "Recovery Password sende"
-#    recovery_sent: "Recovery email sent."
+    send_password: "Widerherstelligs Passwort sende"
+    recovery_sent: "Widerherstelligs Passwort isch gsendet"
 
   items:
-#    primary: "Primary"
-#    secondary: "Secondary"
-#    armor: "Armor"
-#    accessories: "Accessories"
+    primary: "Primär"
+    secondary: "Sekundär"
+    armor: "Rüschtig"
+    accessories: "Accessories"
     misc: "Diverses"
     books: "Büecher"
 
   common:
-#    back: "Back" # When used as an action verb, like "Navigate backward"
-#    continue: "Continue" # When used as an action verb, like "Continue forward"
+    back: "Zrugg" # When used as an action verb, like "Navigate backward"
+    continue: "Wiiterfare" # When used as an action verb, like "Continue forward"
     loading: "Lade..."
     saving: "Speichere..."
     sending: "Sende..."
@@ -151,36 +151,36 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    fork: "Fork"
     play: "Spiele" # When used as an action verb, like "Play next level"
     retry: "nomol versuche"
-#    actions: "Actions"
+    actions: "Aktione"
     info: "Info"
     help: "Hilf"
-#    watch: "Watch"
-#    unwatch: "Unwatch"
+    watch: "Aluege"
+    unwatch: "Nüm Aluege"
     submit_patch: "Patch ireiche"
-#    submit_changes: "Submit Changes"
+    submit_changes: "Wechsel ireiche"
 
   general:
     and: "und"
     name: "Name"
     date: "Datum"
-#    body: "Body"
+    body: "Body"
     version: "Version"
-#    pending: "Pending"
-#    accepted: "Accepted"
-#    rejected: "Rejected"
-#    withdrawn: "Withdrawn"
-#    submitter: "Submitter"
-#    submitted: "Submitted"
-#    commit_msg: "Commit Message"
-#    review: "Review"
+    pending: "in Bearbeitig"
+    accepted: "Akzeptiert"
+    rejected: "Nid akzeptiert"
+    withdrawn: "Zruggzie"
+    submitter: "Sender"
+    submitted: "Gesendet"
+    commit_msg: "Nachricht abschicke"
+    review: "Review"
     version_history: "Versionsverlauf"
-#    version_history_for: "Version History for: "
-#    select_changes: "Select two changes below to see the difference."
-#    undo_prefix: "Undo"
-#    undo_shortcut: "(Ctrl+Z)"
-#    redo_prefix: "Redo"
-#    redo_shortcut: "(Ctrl+Shift+Z)"
-#    play_preview: "Play preview of current level"
+    version_history_for: "Versionsverlauf für: "
+    select_changes: "Wähl zwei Verändrige um unne Ihre Unterschid zgse."
+    undo_prefix: "Eis zrugg"
+    undo_shortcut: "(Ctrl+Z)"
+    redo_prefix: "Nomal mache"
+    redo_shortcut: "(Ctrl+Shift+Z)"
+    play_preview: "Spiel dPreview vom aktuelle Level"
     result: "Resultat"
     results: "Resultat"
     description: "Beschriibig"
@@ -204,7 +204,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     player: "Spieler"
     player_level: "Stufe" # Like player level 5, not like level: Dungeons of Kithgard
     warrior: "Krieger"
-#    ranger: "Ranger"
+    ranger: "Ranger"
     wizard: "Zauberer"
 
   units:
@@ -247,7 +247,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     reload_really: "Bisch sicher du willsch level neu lade bis zrugg zum Afang?"
     reload_confirm: "Alles neu lade"
     victory: "Gwunne"
-#    victory_title_prefix: ""
+    victory_title_prefix: ""
     victory_title_suffix: " Vollständig"
     victory_sign_up: "Meld dich ah zum din Fortschritt speichere"
     victory_sign_up_poke: "Wötsch din Code speichere? Erstell gratis en Account!"
@@ -259,21 +259,22 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     victory_review: "Verzell üs meh!" # Only in old-style levels.
     victory_hour_of_code_done: "Bisch fertig?"
     victory_hour_of_code_done_yes: "Jo, ich bin fertig mit mim Hour of Code™!"
-#    victory_experience_gained: "XP Gained"
-#    victory_gems_gained: "Gems Gained"
-#    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
-#    victory_become_a_viking: "Become a Viking"
+    victory_experience_gained: "Erfarig bechoo"
+    victory_gems_gained: "Edelstei bechoo"
+#    victory_new_item: "New Item"
+    victory_viking_code_school: "Oh mein Gott, dass isch aber es stregs Level gsi und du heschs gschafft! Also wen du nu kei Software-Entwickler bisch, sötsch eine sii! Du hesch en Iiladig becho um at Viking Code Schuel zgha wodu dini Fähigkeite chasch wiiterentwickle und en professionele Entwickel in nur 14 Täg werde!"
+    victory_become_a_viking: "Werd en Vikinger!"
     guide_title: "Handbuech"
     tome_minion_spells: "Zaubersprüch vo dine Minions" # Only in old-style levels.
     tome_read_only_spells: "Read-Only Zaubersprüch" # Only in old-style levels.
     tome_other_units: "Anderi Einheite" # Only in old-style levels.
-#    tome_cast_button_run: "Run"
-#    tome_cast_button_running: "Running"
-#    tome_cast_button_ran: "Ran"
-#    tome_submit_button: "Submit"
-#    tome_reload_method: "Reload original code for this method" # Title text for individual method reload button.
+    tome_cast_button_run: "Renn"
+    tome_cast_button_running: "Renne"
+    tome_cast_button_ran: "grennt"
+    tome_submit_button: "Abschicke"
+    tome_reload_method: "Lad de Orginal Code für die Methode" # Title text for individual method reload button.
     tome_select_method: "Wähl a Methodä"
-#    tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methdos).
+    tome_see_all_methods: "Lueg alli Methode a wot chasch bearbeite" # Title text for method list selector (shown when there are multiple programmable methdos).
     tome_select_a_thang: "Wähl öpper us für"
     tome_available_spells: "Verfüegbari Zaubersprüch"
     tome_your_skills: "Dini Fähigkaitä"
@@ -321,153 +322,154 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     tip_hardware_problem: "F: Wie viel Programmierer bruuchts zum e Glüehbire uswechsle?  A: Keine, da isch es Hardware Problem."
 #    tip_hofstadters_law: "Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law."
 #    tip_premature_optimization: "Premature optimization is the root of all evil. - Donald Knuth"
-#    tip_brute_force: "When in doubt, use brute force. - Ken Thompson"
+    tip_brute_force: "Went am verzwifle bisch, bruch brute force. - Ken Thompson"
 #    tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..."
-#    tip_superpower: "Coding is the closest thing we have to a superpower."
+    tip_superpower: "Coding isch snöchte wo mier hend was ane Superchraaft ane chund!"
 #    tip_control_destiny: "In real open source, you have the right to control your own destiny. - Linus Torvalds"
-#    tip_no_code: "No code is faster than no code."
+    tip_no_code: "Kei Code isch schneller als kei Code!"
 #    tip_code_never_lies: "Code never lies, comments sometimes do. — Ron Jeffries"
 #    tip_reusable_software: "Before software can be reusable it first has to be usable."
 #    tip_optimization_operator: "Every language has an optimization operator. In most languages that operator is ‘//’"
 #    tip_lines_of_code: "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. — Bill Gates"
-#    tip_source_code: "I want to change the world but they would not give me the source code."
-#    tip_javascript_java: "Java is to JavaScript what Car is to Carpet. - Chris Heilmann"
-#    tip_move_forward: "Whatever you do, keep moving forward. - Martin Luther King Jr."
-#    tip_google: "Have a problem you can't solve? Google it!"
+    tip_source_code: "Ich wet dWält verändere aber die wend mier de Source Code nid gää."
+    tip_javascript_java: "Java isch zu JavaScript wie es Auto zume Automat. - Chris Heilmann"
+    tip_move_forward: "Was immer du machsch, mach immer me Fortschritt. - Martin Luther King Jr."
+    tip_google: "Hesch es Problem und chunsch nüm wiiter? Googles doch mal!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-#    tip_open_source_contribute: "You can help CodeCombat improve!"
+    tip_open_source_contribute: "Du chasch helfe CodeCombat zverbessere!"
 #    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
 
   game_menu:
-#    inventory_tab: "Inventory"
+    inventory_tab: "Inventar"
     save_load_tab: "Spaicherä/Ladä"
     options_tab: "Optionä"
-#    guide_tab: "Guide"
-#    guide_video_tutorial: "Video Tutorial"
+    guide_tab: "Guide"
+    guide_video_tutorial: "Vidio Tutorial"
     guide_tips: "Tipps"
     multiplayer_tab: "Multiplayer"
-#    auth_tab: "Sign Up"
-#    inventory_caption: "Equip your hero"
-#    choose_hero_caption: "Choose hero, language"
-#    save_load_caption: "... and view history"
-#    options_caption: "Configure settings"
+    auth_tab: "Regischtriere"
+    inventory_caption: "Rüscht din Held uus"
+    choose_hero_caption: "Wähl din Held und dini Sprach"
+    save_load_caption: "... und lueg dini Gschicht aa."
+    options_caption: "Iistellige apasse"
     guide_caption: "Doku und Tipps"
-#    multiplayer_caption: "Play with friends!"
-#    auth_caption: "Save your progress."
+    multiplayer_caption: "Spil mid dini Fründe!"
+    auth_caption: "Speichere din Fortschritt."
 
-#  leaderboard:
-#    leaderboard: "Leaderboard"
-#    view_other_solutions: "View Leaderboards"
-#    scores: "Scores"
-#    top_players: "Top Players by"
-#    day: "Today"
-#    week: "This Week"
-#    all: "All-Time"
-#    time: "Time"
-#    damage_taken: "Damage Taken"
-#    damage_dealt: "Damage Dealt"
-#    difficulty: "Difficulty"
-#    gold_collected: "Gold Collected"
+  leaderboard:
+    leaderboard: "Ranglischte"
+    view_other_solutions: "Lueg der dRanglischte aa!"
+    scores: "Pünkt"
+    top_players: "Beschti Speiler"
+    day: "Hüt"
+    week: "Die Wuuche"
+    all: "Vo immer"
+    time: "Ziit"
+    damage_taken: "Schade gnoo"
+    damage_dealt: "Schade uusteilt"
+    difficulty: "Schwirigkeitsgrad"
+    gold_collected: "Gold gsammlet"
 
-#  inventory:
-#    choose_inventory: "Equip Items"
-#    equipped_item: "Equipped"
-#    required_purchase_title: "Required"
-#    available_item: "Available"
-#    restricted_title: "Restricted"
-#    should_equip: "(double-click to equip)"
-#    equipped: "(equipped)"
-#    locked: "(locked)"
-#    restricted: "(restricted in this level)"
-#    equip: "Equip"
-#    unequip: "Unequip"
+  inventory:
+    choose_inventory: "Items uusrüschte"
+    equipped_item: "Uusgrüschteti Items"
+    required_purchase_title: "Benötigt"
+    available_item: "Verfüegbar"
+    restricted_title: "Verbote"
+    should_equip: "(2mal Klicke zum uusrüschte)"
+    equipped: "(usgrüschtet)"
+    locked: "(geschperrt)"
+    restricted: "(verbote i dem Level)"
+    equip: "Uusrüschte"
+    unequip: "Nüm Uusrüschte"
 
-#  buy_gems:
-#    few_gems: "A few gems"
-#    pile_gems: "Pile of gems"
-#    chest_gems: "Chest of gems"
-#    purchasing: "Purchasing..."
-#    declined: "Your card was declined"
-#    retrying: "Server error, retrying."
-#    prompt_title: "Not Enough Gems"
-#    prompt_body: "Do you want to get more?"
-#    prompt_button: "Enter Shop"
-#    recovered: "Previous gems purchase recovered. Please refresh the page."
+  buy_gems:
+    few_gems: "Es paar Edelstei"
+    pile_gems: "En hufe vo Edelstei"
+    chest_gems: "En ganzi True voll Edelstei"
+    purchasing: "Kaufen..."
+    declined: "Dini Charte isch leider abglehnt worde."
+    retrying: "Server Fehler, probiere nochmals."
+    prompt_title: "Nid gnug Edelstei!"
+    prompt_body: "Wetsch mee chaufe?"
+    prompt_button: "zum Shop"
+    recovered: "Früenere Ichauf zruggerstatet. Bitte dSite neu lade!"
 #    price: "x3500 / mo"
 
-#  subscribe:
-#    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
-#    feature1: "80+ basic levels across 4 worlds"
+  subscribe:
+    comparison_blurb: "Verschärf dins Chönne midme CodeCombat Abonement."
+    feature1: "80+ basis levels in 4 Weltete!"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+    feature3: "50+ bonus levels" # {change}
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
-#    feature5: "Video tutorials"
-#    feature6: "Premium email support"
-#    free: "Free"
-#    month: "month"
-#    subscribe_title: "Subscribe"
-#    unsubscribe: "Unsubscribe"
-#    confirm_unsubscribe: "Confirm Unsubscribe"
-#    never_mind: "Never Mind, I Still Love You"
-#    thank_you_months_prefix: "Thank you for supporting us these last"
-#    thank_you_months_suffix: "months."
-#    thank_you: "Thank you for supporting CodeCombat."
-#    sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better."
-#    unsubscribe_feedback_placeholder: "O, what have we done?"
-#    parent_button: "Ask your parent"
-#    parent_email_description: "We'll email them so they can buy you a CodeCombat subscription."
-#    parent_email_input_invalid: "Email address invalid."
-#    parent_email_input_label: "Parent email address"
-#    parent_email_input_placeholder: "Enter parent email"
-#    parent_email_send: "Send Email"
-#    parent_email_sent: "Email sent!"
-#    parent_email_title: "What's your parent's email?"
-#    parents: "For Parents"
-#    parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
-#    parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
-#    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-#    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
-#    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
-#    payment_methods: "Payment Methods"
-#    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay."
+    feature5: "Video Aleitige"
+    feature6: "Premium Email Hilf"
+#    feature7: "Private <strong>Clans</strong>"
+    free: "Gratis"
+    month: "Monät"
+    subscribe_title: "Aboniere"
+    unsubscribe: "Deaboniere"
+    confirm_unsubscribe: "Deaboniere beschtätige"
+    never_mind: "Keis Problem, ich lieb dich trotzdem."
+    thank_you_months_prefix: "Danke das du üs die Monät"
+    thank_you_months_suffix: "so unterschtütz hesch."
+    thank_you: "Danke, dass du CodeCombat so unterschtüzisch."
+    sorry_to_see_you_go: "Schad, dass du gasch! Bitte seg üs doch was mier hetted chönne besser mache."
+    unsubscribe_feedback_placeholder: "Ohaletz, was hemmer gmacht?"
+    parent_button: "Frag dini Eltere"
+    parent_email_description: "We'll email them so they can buy you a CodeCombat subscription."
+    parent_email_input_invalid: "Email Adrässi ungültig"
+    parent_email_input_label: "Email Adrässi vo dine Eltere"
+    parent_email_input_placeholder: "Bitte gib dMail Adrässi vo dine Eltere a"
+    parent_email_send: "Email sände"
+    parent_email_sent: "Email gsändet!"
+    parent_email_title: "Wie isch dEmail Adrässi vo dine Eltere?"
+    parents: "Für Eltere"
+    parents_title: "Liebi Eltere, Ihres Chind isch am Lerne wieme programmiert. Wen Sie im helfe?"
+    parents_blurb1: "Ihres CHind hed  __nLevels__ levels gschpilt und hed programmier Basics glernd. Helfed Sie soch dInträssi für sProgrammiere ufrecht zhalte und unterschtützed Sie in idem Sie es Abo chaufed."
+    parents_blurb1a: "Programmiere isch en wichtigi Begabig wo Ihres Chind als Erwachsene sicher wird bruche. Ab 2020 werded 77% vo allne Jobs eifachi Programmierkentniss benötige und die wos behersched werded uf de ganze Welt gsuecht. Hend Sie gwüsst das Programmiere de best bezallti Uni abschluss isch?"
+    parents_blurb2: "Für $9.99 USD/im Monät, würd Ihres Chind jedes Wuche neue und spannendi Challenges becho und professionelle E-Mail Support!"
+    parents_blurb3: "Kei Risikos, 100% Geld zrugg Garantie und ganz eifaches deaboniere mid eim Klick"
+    payment_methods: "Zalligs Methode"
+    payment_methods_title: "Akzeptierti Zalligs Methode"
+    payment_methods_blurb1: "Mier akzeptiered immoment Kreditchartene und  Alipay."
 #    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
 #    stripe_description: "Monthly Subscription"
-#    subscription_required_to_play: "You'll need a subscription to play this level."
+    subscription_required_to_play: "Du bruchsch es Abo um das Level zspile."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 #    personal_sub: "Personal Subscription" # Accounts Subscription View below
-#    loading_info: "Loading subscription information..."
-#    managed_by: "Managed by"
-#    will_be_cancelled: "Will be cancelled on"
-#    currently_free: "You currently have a free subscription"
+    loading_info: "Lade Abo Informatione..."
+    managed_by: "Verwaltet vo"
+    will_be_cancelled: "Wird abbroche am"
+    currently_free: "Du hesch jetzt grad es frii Abo"
 #    currently_free_until: "You currently have a free subscription until"
 #    was_free_until: "You had a free subscription until"
-#    managed_subs: "Managed Subscriptions"
+    managed_subs: "Abos verwalte"
 #    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
 #    group_discounts: "Group discounts"
 #    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
-#    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
+    group_discounts_1st: "Erstes Abonement"
+    group_discounts_full: "de ganz Priis"
+    group_discounts_2nd: "Aboniere 2-11"
+    group_discounts_20: "20% billiger"
+    group_discounts_12th: "Aboniere 12+"
+    group_discounts_40: "40% billiger"
+    subscribing: "Am Aboniere..."
+    recipient_emails_placeholder: "Gib dini Mails zum Aboniere i, eine pro Linie:"
+    subscribe_users: "Abonier Users"
+    users_subscribed: "Users aboniert:"
 #    no_users_subscribed: "No users subscribed, please double check your email addresses."
 #    current_recipients: "Current Recipients"
-#    unsubscribing: "Unsubscribing..."
-#    subscribe_prepaid: "Click Subscribe to use prepaid code"
-#    using_prepaid: "Using prepaid code for monthly subscription"
+    unsubscribing: "Am Abo chünde"
+    subscribe_prepaid: "Klick Aboniere um en PrePaid Code izlöse"
+    using_prepaid: "Bruch en PrePaid Code um en Monet zAboniere"
 
   choose_hero:
-#    choose_hero: "Choose Your Hero"
-#    programming_language: "Programming Language"
-#    programming_language_description: "Which programming language do you want to use?"
-#    default: "Default"
+    choose_hero: "Wähl din Held"
+    programming_language: "Programmiersprach"
+    programming_language_description: "Weli Programmiersprach wetsch benutze?"
+    default: "Standard"
 #    experimental: "Experimental"
     python_blurb: "Eifach und doch mächtig."
     javascript_blurb: "D Internetsproch."
@@ -476,22 +478,22 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     lua_blurb: "D Sproch für Game Scripts."
     io_blurb: "Eifach aber undurchsichtig."
 #    status: "Status"
-#    hero_type: "Type"
-#    weapons: "Weapons"
-#    weapons_warrior: "Swords - Short Range, No Magic"
-#    weapons_ranger: "Crossbows, Guns - Long Range, No Magic"
-#    weapons_wizard: "Wands, Staffs - Long Range, Magic"
-#    attack: "Damage" # Can also translate as "Attack"
-#    health: "Health"
-#    speed: "Speed"
-#    regeneration: "Regeneration"
-#    range: "Range" # As in "attack or visual range"
+    hero_type: "Typ"
+    weapons: "Waffene"
+    weapons_warrior: "Schwärter - churzi Richwiti, kei Magie"
+    weapons_ranger: "Armbrüscht, Knarre - grossi Richwiti, kei Magie"
+    weapons_wizard: "Zauberstäb - grossi Richwiti, Magie"
+    attack: "Schadä" # Can also translate as "Attack"
+    health: "Läbä"
+    speed: "Schnelligkeit"
+    regeneration: "Regeneration"
+    range: "Richwiti" # As in "attack or visual range"
 #    blocks: "Blocks" # As in "this shield blocks this much damage"
 #    backstab: "Backstab" # As in "this dagger does this much backstab damage"
-#    skills: "Skills"
+    skills: "Fähigkeite"
 #    attack_1: "Deals"
 #    attack_2: "of listed"
-#    attack_3: "weapon damage."
+    attack_3: "Waffeschade."
 #    health_1: "Gains"
 #    health_2: "of listed"
 #    health_3: "armor health."
@@ -501,15 +503,15 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    level_to_unlock: "Level to unlock:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
 #    restricted_to_certain_heroes: "Only certain heroes can play this level."
 
-#  skill_docs:
+  skill_docs:
 #    writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this
 #    read_only: "read-only"
-#    action_name: "name"
+    action_name: "name"
 #    action_cooldown: "Takes"
-#    action_specific_cooldown: "Cooldown"
-#    action_damage: "Damage"
-#    action_range: "Range"
-#    action_radius: "Radius"
+    action_specific_cooldown: "Abklingziit"
+    action_damage: "Schade"
+    action_range: "Richwiti"
+    action_radius: "Radius"
 #    action_duration: "Duration"
 #    example: "Example"
 #    ex: "ex" # Abbreviation of "example"
@@ -519,17 +521,15 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    returns: "Returns"
 #    granted_by: "Granted by"
 
-#  save_load:
-#    granularity_saved_games: "Saved"
-#    granularity_change_history: "History"
+  save_load:
+    granularity_saved_games: "Gschpeicheret"
+    granularity_change_history: "Verlauf"
 
   options:
 #    general_options: "General Options" # Check out the Options tab in the Game Menu while playing a level
-#    volume_label: "Volume"
-#    music_label: "Music"
+    volume_label: "Luutstärchi"
+    music_label: "Musig"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
     editor_config_title: "Editor Konfiguration"
     editor_config_level_language_label: "Sproch für das Level"
@@ -568,34 +568,35 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    scott_blurb: "Reasonable One"
 #    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+    michael_title: "Programmierer"
+    michael_blurb: "System Admin"
+    matt_title: "Programmierer" # {change}
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
-#    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
-#    josh_blurb: "Floor Is Lava"
-#    jose_title: "Music"
+    cat_blurb: "Luftbändiger"
+    josh_title: "Game Designer"
+    josh_blurb: "De Bode isch Lava"
+    jose_title: "Musig"
 #    jose_blurb: "Taking Off"
 #    retrostyle_title: "Illustration"
 #    retrostyle_blurb: "RetroStyle Games"
 
-#  teachers:
-#    title: "CodeCombat: Info for Teachers"
+  teachers:
+    title: "CodeCombat: Info für Lehrer"
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"
@@ -618,11 +619,11 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
   versions:
     save_version_title: "Neui Version speichere"
     new_major_version: "Neui Hauptversion"
-#    submitting_patch: "Submitting Patch..."
+    submitting_patch: "Patch am abgee"
 #    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_url: "CLA"
+    cla_suffix: "."
+    cla_agree: "Ich bi iverstandee"
 
   contact:
     contact_us: "CodeCombat kontaktiere"
@@ -630,8 +631,8 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     forum_prefix: "Für öffentlichi Sache versuechs mol stattdesse i "
     forum_page: "üsem Forum"
     forum_suffix: "."
-#    faq_prefix: "There's also a"
-#    faq: "FAQ"
+    faq_prefix: "Es gid au es"
+    faq: "FAQ"
 #    subscribe_prefix: "If you need help figuring out a level, please"
 #    subscribe: "buy a CodeCombat subscription"
 #    subscribe_suffix: "and we'll be happy to help you with your code."
@@ -648,11 +649,11 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     autosave: "Änderige werded automatisch gspeicheret"
     me_tab: "Ich"
     picture_tab: "Bild"
-#    delete_account_tab: "Delete Your Account"
-#    wrong_email: "Wrong Email"
+    delete_account_tab: "Din Account lösche"
+    wrong_email: "Falschi Email Adrässe"
     upload_picture: "Es Bild ufelade"
-#    delete_this_account: "Delete this account permanently"
-#    god_mode: "God Mode"
+    delete_this_account: "Dä Account für immer Lösche"
+    god_mode: "Gott Modus"
     password_tab: "Passwort"
     emails_tab: "E-Mails"
     admin: "Admin"
@@ -667,7 +668,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     email_notifications_summary: "Istellige für personalisierti, automatischi E-Mail Notifikatione im Zemehang mit dine CodeCombat Aktivitäte"
     email_any_notes: "Alli Notifikatione"
     email_any_notes_description: "Deaktiviere zum kei Aktivitäts-Notifikatione meh per E-Mail becho."
-#    email_news: "News"
+    email_news: "Neuigkeite"
 #    email_recruit_notes: "Job Opportunities"
 #    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
 #    contributor_emails: "Contributor Class Emails"
@@ -683,16 +684,16 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
 #    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
+    view_profile: "Dis Profil aluege"
 
   keyboard_shortcuts:
     keyboard_shortcuts: "Shortcuts uf de Tastatur"
     space: "Space"
     enter: "Enter"
     escape: "Escape"
-#    shift: "Shift"
-#    run_code: "Run current code."
-#    run_real_time: "Run in real time."
+    shift: "Shift"
+    run_code: "De jetzig Code laufe laa."
+    run_real_time: "In Echtziit laufe laa."
     continue_script: "Nochem aktuelle Script fortsetze."
     skip_scripts: "Alli überspringbare Scripts überspringe."
     toggle_playback: "Play/Pause istelle."
@@ -703,7 +704,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
     toggle_grid: "Gitter ischalte/usschalte."
     toggle_pathfinding: "Wegfinder ischalte/usschalte."
     beautify: "Mach din Code schöner, indem du sini Formatierig standartisiersch."
-#    maximize_editor: "Maximize/minimize code editor."
+    maximize_editor: "Maximize/minimize de code editor."
 
   community:
     main_title: "CodeCombat Community"
@@ -1289,7 +1290,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    player_code: "Player Code"
 
   employers:
-#    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
+    deprecation_warning_title: "Sorry, CodeCombat rekrutiert grad nid."
 #    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
     hire_developers_not_credentials: "Stell Entwickler ah, nid Zügnis." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
 #    get_started: "Get Started"

app/locale/de-DE.coffee

@@ -1,7 +1,7 @@
 module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: "German (Germany)", translation:
   home:
     slogan: "Lerne spielend Programmieren"
-    no_ie: "CodeCombat läuft nicht im IE 8 oder älteren Browsern. Tut uns Leid!" # Warning that only shows up in IE8 and older
+    no_ie: "CodeCombat läuft nicht im IE 8 oder älteren Browsern. Tut uns leid!" # Warning that only shows up in IE8 and older
     no_mobile: "CodeCombat ist nicht für Mobilgeräte optimiert und funktioniert möglicherweise nicht." # Warning that shows up on mobile devices
     play: "Spielen" # The big play button that opens up the campaign view.
     old_browser: "Oh! Dein Browser ist zu alt für CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari
@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     anonymous: "Anonymer Spieler"
     level_difficulty: "Schwierigkeit: "
     campaign_beginner: "Anfängerkampagne"
-    awaiting_levels_adventurer_prefix: "Wir veröffentlichen fünf Levels pro Woche."
+    awaiting_levels_adventurer_prefix: "Wir veröffentlichen fünf Levels pro Woche." # {change}
     awaiting_levels_adventurer: "Registriere dich als ein Abenteurer"
     awaiting_levels_adventurer_suffix: "sei der Erste, der neue Levels spielt."
     adjust_volume: "Lautstärke anpassen"
@@ -90,7 +90,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     campaign_multiplayer_description: "... in der Du Kopf-an-Kopf gegen andere Spieler programmierst."
     campaign_player_created: "Von Spielern erstellt"
     campaign_player_created_description: "... in welchem Du gegen die Kreativität eines <a href=\"/contribute#artisan\">Artisan Zauberers</a> kämpfst."
-    campaign_classic_algorithms: "Klassiche Algorithmen"
+    campaign_classic_algorithms: "Klassische Algorithmen"
     campaign_classic_algorithms_description: "... in welchem du die populärsten Algorithmen der Informatik lernst."
 
   share_progress_modal:
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     victory_hour_of_code_done_yes: "Ja, ich bin mit meiner Code-Stunde fertig!"
     victory_experience_gained: "Gewonnene XP"
     victory_gems_gained: "Gewonnene Edelsteine"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Anleitung"
@@ -336,7 +337,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     tip_google: "Hast du ein Problem, das du nicht lösen kannst? Google es!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-    tip_open_source_contribute: "Du kannst Dabei helfen, CodeCombat zu verbessern."
+    tip_open_source_contribute: "Du kannst dabei helfen, CodeCombat zu verbessern."
 #    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
 
   game_menu:
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     feature4: "<strong>3500 Bonusedelsteine</strong> jeden Monat!"
     feature5: "Videoanleitungen"
     feature6: "Premium Emailsupport"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Kostenlos"
     month: "Monate"
     subscribe_title: "Abonnieren"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     parent_email_title: "Wie lautet die Emailadresse deiner Eltern?"
     parents: "Für Eltern"
     parents_title: "Dein Kind lernt zu programmieren." # {change}
-    parents_blurb1: "Mit CodeCombat, lernt dein Kind richtige Programme zu schreiben. Es fängt mit einfachen Befehlen an, und schreitet ganz unmerklich zu schwierigeren Themen fort." # {change}
+    parents_blurb1: "Mit CodeCombat, lernt dein Kind richtige Programme zu schreiben. Es fängt mit einfachen Befehlen an, und schreitet ganz unmerklich zu schwierigeren Themen fort."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "Für 9.99 im Monat, bekommt es jede Woche neue Herausforderungen sowie persönlichen Email Support von professionellen Programmierern." # {change}
     parents_blurb3: "Kein Risiko: 100% Geld zurück Garantie, und 1-Klick Abokündigung."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     volume_label: "Lautstärke"
     music_label: "Musik"
     music_description: "Schalte Hintergrundmusik an/aus."
-    autorun_label: "Autorun"
-    autorun_description: "Steuere automatische Programmausführung."
     editor_config: "Editor Einstellungen"
     editor_config_title: "Editor Einstellungen"
     editor_config_level_language_label: "Sprache für dieses Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     nick_blurb: "Motivationsguru"
     michael_title: "Programmierer"
     michael_blurb: "Sys Admin"
-    matt_title: "Programmierer"
+    matt_title: "Programmierer" # {change}
     matt_blurb: "Radfahrer"
     cat_title: "Chief Artisan"
     cat_blurb: "Luftbändiger"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"
@@ -735,7 +736,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     adventurer_summary: "Bekomme unsere neuen Level (sogar unseren Abonnement Inhalt) kostenlos eine Woche früher und hilf uns, Fehler vor der Veröffentlichung zu finden."
     scribe_title: "Schreiber"
     scribe_title_description: "(Artikel Editor)"
-    scribe_summary: "Guter Code braucht gute Dokumentation. Schreibe, bearbeite and verbessere die, von weltweit Millionen von Spielern, gelesenen Dokumentationen."
+    scribe_summary: "Guter Code braucht gute Dokumentation. Schreibe, bearbeite und verbessere die, von weltweit Millionen von Spielern, gelesenen Dokumentationen."
     diplomat_title: "Diplomat"
     diplomat_title_description: "(Übersetzer)"
     diplomat_summary: "CodeCombat wird in 45+ Sprachen von unseren Diplomaten übersetzt. Hilf uns und steuere Übersetzungen bei."
@@ -835,7 +836,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 
   contribute:
     page_title: "Mitwirken"
-    intro_blurb: "CodeCombat ist zu 100% Open Source! Hunderte hingebungsvolle Spieler haben uns geholfen das Spiel zu dem zu machen was es heute ist. Trete uns bei und schreibe das nächste Kapitel in CodeCombat' Aufgabe, der Welt das Programmieren zu lehren!"
+    intro_blurb: "CodeCombat ist zu 100% Open Source! Hunderte hingebungsvolle Spieler haben uns geholfen das Spiel zu dem zu machen was es heute ist. Tritt uns bei und schreibe das nächste Kapitel in CodeCombat' Aufgabe, der Welt das Programmieren zu lehren!"
     alert_account_message_intro: "Hey du!"
     alert_account_message: "Um Klassen-Emails abonnieren zu können, musst du dich zuerst anmelden."
     archmage_introduction: "Einer der größten Vorteile daran ein Spiel aufzubauen, ist es, dass so viele verschiedene Aspekte eine Rolle spielen. Grafiken, Sound, Echtzeit Networking, Social Networking und natürlich viele der gewöhnlichen Aspekte des Programmierens, von low-level Datenbankmanagement und Server Administration bis hin zum Aufbau von Design und Interface. Es gibt viel zu tun und wenn du ein erfahrener Programmierer bist, mit einer Veranlagung dazu, wirklich knallhart bei CodeCombat einzutauchen, dann könnte diese Klasse etwas für dich sein. Wir würden uns wahnsinnig  über deine Hilfe dabei freuen, das beste Programmierspiel der Welt aufzubauen."

app/locale/el.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     anonymous: "Ανώνυμοι Παίκτες"
     level_difficulty: "Δυσκολία: "
     campaign_beginner: "Εκστρατεία για Αρχάριους"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     victory_hour_of_code_done_yes: "Ναι, έχω τελειώσει με την Hour of Code!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Οδηγός"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/en-GB.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/en-US.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/en.coffee

@@ -74,7 +74,7 @@
     anonymous: "Anonymous Player"
     level_difficulty: "Difficulty: "
     campaign_beginner: "Beginner Campaign"
-    awaiting_levels_adventurer_prefix: "We release five levels per week."
+    awaiting_levels_adventurer_prefix: "We release new levels every week."
     awaiting_levels_adventurer: "Sign up as an Adventurer"
     awaiting_levels_adventurer_suffix: "to be the first to play new levels."
     adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@
     victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
     victory_experience_gained: "XP Gained"
     victory_gems_gained: "Gems Gained"
+    victory_new_item: "New Item"
     victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Become a Viking"
     guide_title: "Guide"
@@ -273,7 +274,7 @@
     tome_submit_button: "Submit"
     tome_reload_method: "Reload original code for this method"  # Title text for individual method reload button.
     tome_select_method: "Select a Method"
-    tome_see_all_methods: "See all methods you can edit"  # Title text for method list selector (shown when there are multiple programmable methdos).
+    tome_see_all_methods: "See all methods you can edit"  # Title text for method list selector (shown when there are multiple programmable methods).
     tome_select_a_thang: "Select Someone for "
     tome_available_spells: "Available Spells"
     tome_your_skills: "Your Skills"
@@ -290,6 +291,11 @@
     time_current: "Now:"
     time_total: "Max:"
     time_goto: "Go to:"
+    non_user_code_problem_title: "Unable to Load Level"
+    infinite_loop_title: "Infinite Loop Detected"
+    infinite_loop_description: "The initial code to build the world never finished running. It's probably either really slow or has an infinite loop. Or there might be a bug. You can either try running this code again or reset the code to the default state. If that doesn't fix it, please let us know."
+    check_dev_console: "You can also open the developer console to see what might be going wrong."
+    check_dev_console_link: "(instructions)"
     infinite_loop_try_again: "Try Again"
     infinite_loop_reset_level: "Reset Level"
     infinite_loop_comment_out: "Comment Out My Code"
@@ -400,10 +406,11 @@
     comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
     feature1: "80+ basic levels across 4 worlds"
     feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-    feature3: "50+ bonus levels"
+    feature3: "60+ bonus levels"
     feature4: "<strong>3500 bonus gems</strong> every month!"
     feature5: "Video tutorials"
     feature6: "Premium email support"
+    feature7: "Private <strong>Clans</strong>"
     free: "Free"
     month: "month"
     subscribe_title: "Subscribe"
@@ -446,6 +453,7 @@
     was_free_until: "You had a free subscription until"
     managed_subs: "Managed Subscriptions"
     managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
+    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
     group_discounts: "Group discounts"
     group_discounts_1: "We also offer group discounts for bulk subscriptions."
     group_discounts_1st: "1st subscription"
@@ -529,8 +537,6 @@
     volume_label: "Volume"
     music_label: "Music"
     music_description: "Turn background music on/off."
-    autorun_label: "Autorun"
-    autorun_description: "Control automatic code execution."
     editor_config: "Editor Config"
     editor_config_title: "Editor Configuration"
     editor_config_level_language_label: "Language for This Level"
@@ -571,7 +577,7 @@
     nick_blurb: "Motivation Guru"
     michael_title: "Programmer"
     michael_blurb: "Sys Admin"
-    matt_title: "Cofounder" # {change}
+    matt_title: "Cofounder"
     matt_blurb: "Bicyclist"
     cat_title: "Chief Artisan"
     cat_blurb: "Airbender"
@@ -587,25 +593,26 @@
     intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
     intro_2: "No experience required!"
     free_title: "How much does it cost?"
-    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
     free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
     teacher_subs_title: "Teachers get free subscriptions!"
     teacher_subs_1: "Please contact"
     teacher_subs_2: "to set up a free monthly subscription."
     sub_includes_title: "What is included in the subscription?"
     sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-    sub_includes_2: "50+ practice levels"
+    sub_includes_2: "60+ practice levels"
     sub_includes_3: "Video tutorials"
     sub_includes_4: "Premium email support"
     sub_includes_5: "7 new heroes with unique skills to master"
     sub_includes_6: "3500 bonus gems every month"
+    sub_includes_7: "Private Clans"
     who_for_title: "Who is CodeCombat for?"
     who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
     who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
     material_title: "How much material is there?"
-    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
     concepts_title: "What concepts are covered?"
     how_much_title: "How much does a monthly subscription cost?"
     how_much_1: "A"
@@ -1162,7 +1169,7 @@
     rights_clarification: "To clarify, anything that is made available in the Level Editor for the purpose of making levels is under CC, whereas the content created with the Level Editor or uploaded in the course of creation of Levels is not."
     nutshell_title: "In a Nutshell"
     nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
-    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
+    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepancies between translations, the English document takes precedence."
 
   ladder_prizes:
     title: "Tournament Prizes"  # This section was for an old tournament and doesn't need new translations now.

app/locale/eo.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/es-419.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     anonymous: "Jugador Anónimo"
     level_difficulty: "Dificultad: "
     campaign_beginner: "Campaña para principiantes"
-    awaiting_levels_adventurer_prefix: "Nosotros creamos 5 nuevos niveles cada semana"
+    awaiting_levels_adventurer_prefix: "Nosotros creamos 5 nuevos niveles cada semana" # {change}
     awaiting_levels_adventurer: "Registrate como un aventurero"
     awaiting_levels_adventurer_suffix: "para ser el primero en jugar nuevos niveles."
     adjust_volume: "Ajustar el volumen"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     victory_hour_of_code_done_yes: "¡Si, he terminado con mi Hora de Código!"
     victory_experience_gained: "XP Ganada"
     victory_gems_gained: "Gemas Ganadas"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Guía"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     feature4: "<strong>3500 gemas bonus</strong> cada mes!"
     feature5: "Video tutoriales"
     feature6: "Soporte Premium vía email"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Gratis"
     month: "mes"
     subscribe_title: "Suscribirse"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     parent_email_title: "Cuál es el email de tus padres?"
     parents: "Para padres"
     parents_title: "Su hijo aprenderá a programar." # {change}
-    parents_blurb1: "Con CodeCombat, su hijo aprenderá a escribiendo código real. Empezaran aprendiendo comandos simples avanzando a temas más complejos." # {change}
+    parents_blurb1: "Con CodeCombat, su hijo aprenderá a escribiendo código real. Empezaran aprendiendo comandos simples avanzando a temas más complejos."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "Por $9.99 USD/mes, recibirán nuevos desafíos todas las semanas y soporte personal por email de programadores profesionales." # {change}
     parents_blurb3: "Sin Riesgo: Garantía de 100% de devolución, fácil 1-click y des- suscribirse."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     volume_label: "Volumen"
     music_label: "Música"
     music_description: "Música encendida/apagada."
-    autorun_label: "Auto ejecutar"
-    autorun_description: "Controlar ejecución automática de código."
     editor_config: "Config. de Editor"
     editor_config_title: "Configuración del Editor"
     editor_config_level_language_label: "Lenguaje para este Nivel"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     nick_blurb: "Gurú motivacional"
     michael_title: "Programador"
     michael_blurb: "Sys Admin"
-    matt_title: "Programador"
+    matt_title: "Programador" # {change}
     matt_blurb: "Bicicletero"
     cat_title: "Jefe Artesano"
     cat_blurb: "Maestro del Aire"
@@ -586,8 +586,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     intro_1: "CodeCombat es un juego online que enseña a programar.Los estudiantes escriben código en idiomas de programación real."
     intro_2: "No se necesita experiencia previa!"
     free_title: "¿Cuanto cuesta?"
-    cost_china: "CodeCombat es gratis en China por los primeros cinco niveles, despues cuesta $9.99(dólares) por mes para tener acceso a 120+ niveles que son exclusivos en nuestros servidores en China."
-    free_1: "CodeCombat Basic es GRATIS! Hay 70+ niveles gratis que cubren cada concepto."
+    cost_china: "CodeCombat es gratis en China por los primeros cinco niveles, despues cuesta $9.99(dólares) por mes para tener acceso a 120+ niveles que son exclusivos en nuestros servidores en China." # {change}
+    free_1: "CodeCombat Basic es GRATIS! Hay 70+ niveles gratis que cubren cada concepto." # {change}
     free_2: "Una suscripción mensual le da acceso a tutoriales en vídeo y niveles extra para practicar."
     teacher_subs_title: "¡Los amestros obtienen subscripciones gratuitas!"
     teacher_subs_1: "Por favor contacte"
@@ -596,6 +596,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     sub_includes_1: "Adicionalmente a los más de 70 niveles básicos, los estudiantes con una suscripción mensual obtienen acceso a estas características adicionales:" # {change}
     sub_includes_2: "Más de 40 niveles de práctica" # {change}
     sub_includes_3: "Video tutoriales"
+#    sub_includes_7: "Private Clans"
     sub_includes_4: "Soporte de correo electronico Premium"
     sub_includes_5: "7 heroes nuevos con habilidades unicas que dominar"
     sub_includes_6: "bonificación de 3500 gemas cada mes"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     who_for_1: "Recomendamos CodeCombat para estudiantes de edades 9 y arriba. No se require experiencia en programación."
     who_for_2: "Hemos diseñado a CodeCombat para atraer a niños y niñas."
     material_title: "Cuánto material hay?"
-    material_china: "Aproximadamente 22 horas de juego repartidas en más de 120 niveles sólo para suscriptores, con cinco nueveos niveles cada semana."
-    material_1: "Aproximadamente 8 horas de contenido gratis y un adicional de 14 horas de contenido de suscriptores, con cinco nueveos niveles cada semana."
+    material_china: "Aproximadamente 22 horas de juego repartidas en más de 120 niveles sólo para suscriptores, con cinco nueveos niveles cada semana." # {change}
+    material_1: "Aproximadamente 8 horas de contenido gratis y un adicional de 14 horas de contenido de suscriptores, con cinco nueveos niveles cada semana." # {change}
 #    concepts_title: "What concepts are covered?"
     how_much_title: "¿Cuánto cuesta una subscripción mensual?"
     how_much_1: "una"

app/locale/es-ES.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     anonymous: "Jugador Anonimo"
     level_difficulty: "Dificultad: "
     campaign_beginner: "Campaña de Principiante"
-    awaiting_levels_adventurer_prefix: "Liberamos cinco niveles cada semana."
+    awaiting_levels_adventurer_prefix: "Liberamos cinco niveles cada semana." # {change}
     awaiting_levels_adventurer: "Regístrate como Aventurero"
     awaiting_levels_adventurer_suffix: "para ser el primero en jugar nuevos niveles."
     adjust_volume: "Ajustar volúmen"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     victory_hour_of_code_done_yes: "Si, ¡He terminado con mi hora de código!"
     victory_experience_gained: "XP Conseguida"
     victory_gems_gained: "Gemas Conseguidas"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Guía"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
     feature5: "Vídeo tutoriales"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Gratis"
     month: "mes"
     subscribe_title: "Suscríbete"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    parent_email_title: "What's your parent's email?"
     parents: "Para Padres"
     parents_title: "Tus hijos aprenderan a programar." # {change}
-    parents_blurb1: "Con CodeCombat, tus hijos aprendes a desarrollar código real. Al inicio aprenden comandos simples, y avanzan a temas más avanzados." # {change}
+    parents_blurb1: "Con CodeCombat, tus hijos aprendes a desarrollar código real. Al inicio aprenden comandos simples, y avanzan a temas más avanzados."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "Por $9.99 USD/mes, tienen nuevos desafios cada semana y un correo personal con soporte de nuestros programadores profesionales." # {change}
     parents_blurb3: "Sin riesgo: 100% garantía de devoluación de dinero, desuscripción con un simple click."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     volume_label: "Volumen"
     music_label: "Musica"
     music_description: "Musica de fondo on/off."
-    autorun_label: "Autorun"
-    autorun_description: "Control automatico de codigo en ejecucion."
     editor_config: "Conf. editor"
     editor_config_title: "Configuración del editor"
     editor_config_level_language_label: "Lenguaje para este nivel"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     nick_blurb: "Guru Motivacional"
     michael_title: "Programador"
     michael_blurb: "Administrador de Sistemas"
-    matt_title: "Programador"
+    matt_title: "Programador" # {change}
     matt_blurb: "Ciclista"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/fa.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    anonymous: "Anonymous Player"
     level_difficulty: "سختی: "
     campaign_beginner: "کمپین تازه کارها"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/fi.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     anonymous: "Nimetön Pelaaja"
     level_difficulty: "Vaikeustaso: "
     campaign_beginner: "Aloittelijan Kamppanja"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
     adjust_volume: "Aänenvoimakkuus"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     victory_hour_of_code_done_yes: "Kyllä, Koodituntini on vamis!"
     victory_experience_gained: "Kokemusta"
     victory_gems_gained: "Jalokiviä"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Opas"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Ilmainen"
     month: "kuukausi"
     subscribe_title: "Tilaa"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     volume_label: "Äänenvoimakkuus"
     music_label: "Musiikki"
     music_description: "Aseta taustamusiikki päälle/pois päältä."
-    autorun_label: "Näytä"
-    autorun_description: "Miten koodia suoritetaan automaattisesti."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/fr.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     anonymous: "Joueur anonyme"
     level_difficulty: "Difficulté : "
     campaign_beginner: "Campagne du Débutant"
-    awaiting_levels_adventurer_prefix: "Nous produisons cinq niveaux par semaine."
+    awaiting_levels_adventurer_prefix: "Nous produisons cinq niveaux par semaine." # {change}
     awaiting_levels_adventurer: "S'inscrire comme aventurier"
     awaiting_levels_adventurer_suffix: "afin d'être le premier à jouer de nouveaux niveaux."
     adjust_volume: "Ajuster le volume"
@@ -261,8 +261,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     victory_hour_of_code_done_yes: "Oui, j'ai fini mon heure de code !"
     victory_experience_gained: "XP gagnée"
     victory_gems_gained: "Gemmes gagnées"
+    victory_new_item: "Nouvel item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
-#    victory_become_a_viking: "Become a Viking"
+    victory_become_a_viking: "Devenez un viking"
     guide_title: "Guide"
     tome_minion_spells: "Les sorts de vos soldats" # Only in old-style levels.
     tome_read_only_spells: "Sorts en lecture-seule" # Only in old-style levels.
@@ -324,19 +325,19 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tip_brute_force: "En cas de doute, utiliser la force brute. - Ken Thompson"
     tip_extrapolation: "Il y a seulement deux types de personnes : celles qui peuvent extrapoler à partir de données incomplètes..."
     tip_superpower: "Le développement est la chose la plus proche d'un super pouvoir."
-#    tip_control_destiny: "In real open source, you have the right to control your own destiny. - Linus Torvalds"
+    tip_control_destiny: "Dans le vrai open source, vous avez le controle sur votre propre destinée. - Linus Torvalds"
     tip_no_code: "Aucun code n'est plus rapide qu'aucun code."
     tip_code_never_lies: "Le code ne ment jamais, les commentaires... parfois — Ron Jeffries"
-#    tip_reusable_software: "Before software can be reusable it first has to be usable."
-#    tip_optimization_operator: "Every language has an optimization operator. In most languages that operator is ‘//’"
-#    tip_lines_of_code: "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. — Bill Gates"
-#    tip_source_code: "I want to change the world but they would not give me the source code."
-#    tip_javascript_java: "Java is to JavaScript what Car is to Carpet. - Chris Heilmann"
+    tip_reusable_software: "Avant qu'un logiciel soit réutilisable, il doit être utilisable"
+    tip_optimization_operator: "Tout les langages ont un opérateur d'optimisation. Dans la plupart des langages, cet opérateur est ‘//’"
+    tip_lines_of_code: "Mesurer l'avancé d'un programme par le nombre de lignes de code, c'est comme mesurer l'avancé d'un avion par son poid. - Bill Gates"
+    tip_source_code: "Je voudrais changer le monde, mais ils ne veulent pas me donner le code source."
+    tip_javascript_java: "le Java est au Javascript ce que le tapis est à la tapisserie"
     tip_move_forward: "Quoi que vous fassiez, continuez d'avancer. - Martin Luther King Jr."
-#    tip_google: "Have a problem you can't solve? Google it!"
+    tip_google: "*Vous avez un problème que vous n'arrivez pas à résoudre ? Googlez le !"
     tip_adding_evil: "Ajout d'une pincée de méchanceté"
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-#    tip_open_source_contribute: "You can help CodeCombat improve!"
+    tip_open_source_contribute: "Vous pouvez aider CodeCombat à s'améliorer !"
 #    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
 
   game_menu:
@@ -394,7 +395,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     prompt_body: "En voulez-vous plus ?"
     prompt_button: "Entrer dans la boutique"
     recovered: "Gemmes précédemment achetées récupérées. Merci de rafraîchir la page."
-#    price: "x3500 / mo"
+    price: "x3500 / mo"
 
   subscribe:
     comparison_blurb: "Aiguisez vos compétences avec un abonnement CodeCombat !"
@@ -404,12 +405,13 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     feature4: "<strong>3500 gemmes bonus</strong> tous les mois !"
     feature5: "Tutoriels vidéo"
     feature6: "Assitance par e-mail dédiée"
+    feature7: "<strong>Clans</strong> privés"
     free: "Gratuit"
     month: "mois"
     subscribe_title: "Abonnement"
     unsubscribe: "Désinscription"
     confirm_unsubscribe: "Confirmer la désinscription"
-#    never_mind: "Never Mind, I Still Love You"
+    never_mind: "Ça ne fait rien, je t'aime toujours"
     thank_you_months_prefix: "Merci de nous avoir supporté pendant"
     thank_you_months_suffix: "mois."
     thank_you: "Merci de supporter CodeCombat."
@@ -425,19 +427,19 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     parent_email_title: "Quelle est l'adresse e-mail de tes parents ?"
     parents: "Pour les parents"
     parents_title: "Votre enfant va apprendre à programmer." # {change}
-    parents_blurb1: "Avec CodeCombat, votre enfant apprend en écrivant de vrais programmes. Il commence en apprenant des instructions simples, puis progresse sur des thèmes plus complexes." # {change}
-#    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
+    parents_blurb1: "Avec CodeCombat, votre enfant apprend en écrivant de vrais programmes. Il commence en apprenant des instructions simples, puis progresse sur des thèmes plus complexes."
+    parents_blurb1a: "La programmation informatique est une compétence essentielle que votre fils va indubitablement utiliser comme un adulte. En 2020, les compétences basiques en informatique seront obligatoires pour 77% des travails, et les ingénieurs logiciels seront fortement demandés partout dans le monde. Saviez-vous que l'informatique est la compétence universitaire la mieux payée ?"
     parents_blurb2: "Pour $9.99 USD/mois, il obtient de nouveaux défis chaque semaine et le support par e-mail de programmeurs professionnels." # {change}
     parents_blurb3: "Pas de risque : garantie 100% remboursé, désinscription facile en 1 clic."
-#    payment_methods: "Payment Methods"
-#    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay."
-#    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
+    payment_methods: "Moyens de paiement"
+    payment_methods_title: "Moyens de paiement acceptés"
+    payment_methods_blurb1: "Nous acceptons pour le moment les cartes de crédit et les paiment par Alipay."
+    payment_methods_blurb2: "Si vous avez besoins d'un autre moyen de paiement, merci de nous contacter"
     stripe_description: "Inscription mensuelle"
     subscription_required_to_play: "Vous avez besoin d'un abonnement pour jouer à ce niveau."
     unlock_help_videos: "Abonnez vous pour débloquer tous les tutoriels vidéo."
-#    personal_sub: "Personal Subscription" # Accounts Subscription View below
-#    loading_info: "Loading subscription information..."
+    personal_sub: "Abonnement individuelle" # Accounts Subscription View below
+    loading_info: "Chargement des informations sur votre abonnement..."
 #    managed_by: "Managed by"
 #    will_be_cancelled: "Will be cancelled on"
 #    currently_free: "You currently have a free subscription"
@@ -476,7 +478,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     lua_blurb: "Langage de script de jeu."
     io_blurb: "Simple mais obscur."
     status: "Statut"
-#    hero_type: "Type"
+    hero_type: "Type"
     weapons: "Arme"
     weapons_warrior: "Epées - Courte portée, pas de magie"
     weapons_ranger: "Arbalètes, pistolets - Longue portée, pas de magie"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     volume_label: "Volume"
     music_label: "Musique"
     music_description: "Arrêter/Reprendre la musique de fond."
-    autorun_label: "Auto-exécution"
-    autorun_description: "Controler l'exécution automatique du code."
     editor_config: "Config de l'éditeur"
     editor_config_title: "Configuration de l'éditeur"
     editor_config_level_language_label: "Langage pour le niveau"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     nick_blurb: "Gourou de Motivation"
     michael_title: "Programmeur"
     michael_blurb: "Sys Admin"
-    matt_title: "Programmeur"
+    matt_title: "Programmeur" # {change}
     matt_blurb: "Bicycliste"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,8 +586,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     intro_1: "CodeCombat est un jeu en ligne qui enseigne la programmation. Les élèves écrivent du code dans de vrais langages de programmation."
     intro_2: "Aucune expérience requise !"
     free_title: "Combien cela coûte-t-il ?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-    free_1: "La version de base de CodeCombat est gratuite ! Il y a 70+ niveaux gratuits qui couvrent chaque concepts."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+    free_1: "La version de base de CodeCombat est gratuite ! Il y a 70+ niveaux gratuits qui couvrent chaque concepts." # {change}
     free_2: "Un abonnement mensuel fournit l'accès à des vidéos de tutoriels ainsi qu'à des niveaux d'entraînement supplémentaires."
     teacher_subs_title: "Les enseignants reçoivent un abonnement gratuit !"
     teacher_subs_1: "Merci de nous contacter"
@@ -596,6 +596,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     sub_includes_1: "En plus des 70+ niveaux de base, les élèves avec un abonnement mensuel ont accès à ces fonctionnalités supplémentaires :" # {change}
     sub_includes_2: "40+ niveaux d'entrainement" # {change}
     sub_includes_3: "Des tutoriels vidéo"
+#    sub_includes_7: "Private Clans"
     sub_includes_4: "Support email premium"
     sub_includes_5: "7 nouveaux héros avec des capacités uniques à maitriser"
     sub_includes_6: "3500 gemmes bonus chaque mois"
@@ -603,7 +604,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     who_for_1: "Nous recommandons CodeCombat pour les élèves âgés de 9 ans ou plus. Aucune expérience préalable de programmation n'est requise."
     who_for_2: "Nous avons conçu CodeCombat pour plaire à la fois aux garçons et aux filles."
     material_title: "Quelle quantité de contenu y a t-il ?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
     material_1: "Environ 8 heures de contenu gratuit et 14 heures de contenu supplémentaire reservé aux abonnés, avec 5 nouveaux niveaux chaque semaines." # {change}
     concepts_title: "Quels concepts sont couverts ?"
     how_much_title: "Combien coûte un abonnement mensuel ?"
@@ -648,17 +649,17 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     autosave: "Enregistrer automatiquement les modifications"
     me_tab: "Moi"
     picture_tab: "Photos"
-#    delete_account_tab: "Delete Your Account"
-#    wrong_email: "Wrong Email"
-    upload_picture: "Héberger une image"
-#    delete_this_account: "Delete this account permanently"
+    delete_account_tab: "Supprimer votre compte"
+    wrong_email: "Mauvaise adresse e-mail"
+    upload_picture: "Télécharger une image"
+    delete_this_account: "Supprimer votre compte définitivement"
     god_mode: "Puissance Divine"
     password_tab: "Mot de passe"
     emails_tab: "E-mails"
     admin: "Admin"
     new_password: "Nouveau mot de passe"
     new_password_verify: "Vérifier"
-#    type_in_email: "Type in your email to confirm the deletion"
+    type_in_email: "Entrez votre adresse e-mail pour confirmer la supression de votre compte"
     email_subscriptions: "Abonnements"
     email_subscriptions_none: "Aucun e-mail d'abonnement."
     email_announcements: "Annonces"
@@ -824,7 +825,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     level_completion: "Niveau d'achèvement"
     pop_i18n: "Renseigner I18N"
     tasks: "Tâches"
-#    clear_storage: "Clear your local changes"
+    clear_storage: "Vider vos changements locaux"
 
   article:
     edit_btn_preview: "Prévisualiser"
@@ -946,7 +947,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     fight: "Combattez !"
     watch_victory: "Regardez votre victoire"
     defeat_the: "Vaincre le"
-#    tournament_started: ", started"
+    tournament_started: ", a démarré"
     tournament_ends: "Fin du tournoi"
     tournament_ended: "Tournoi terminé"
     tournament_rules: "Règles du tournoi"
@@ -996,7 +997,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     payments: "Paiements"
     purchased: "Acheté"
     subscription: "Souscrit"
-#    invoices: "Invoices"
+    invoices: "Factures"
     service_apple: "Apple"
     service_web: "Web"
     paid_on: "Payé"
@@ -1013,15 +1014,15 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     status_unsubscribed_active: "Vous n'êtes pas inscrit et ne serez pas facturé, mais votre compte est toujours actif."
     status_unsubscribed: "Obtenez l'accès à de nouveaux niveaux, héros, objets et gemmes en bonus avec une inscription à CodeCombat !"
 
-#  account_invoices:
-#    amount: "Amount in US dollars"
-#    declined: "Your card was declined"
-#    invalid_amount: "Please enter a US dollar amount."
-#    not_logged_in: "Log in or create an account to access invoices."
-#    pay: "Pay Invoice"
-#    purchasing: "Purchasing..."
-#    retrying: "Server error, retrying."
-#    success: "Successfully paid. Thanks!"
+  account_invoices:
+    amount: "Montant (Dollars US)"
+    declined: "Votre carte a été refusée"
+    invalid_amount: "Entrez un montant en dollars US."
+    not_logged_in: "Connectez vous ou créez un compte pour accéder aux factures."
+    pay: "Paiement de facture"
+    purchasing: "Achat..."
+    retrying: "Erreur interne, réessayez"
+    success: "Paiement accepté, Merci !"
 
   loading_error:
     could_not_load: "Erreur de chargement du serveur"

app/locale/gl.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     anonymous: "Xogador Anónimo"
     level_difficulty: "Dificultade: "
     campaign_beginner: "Campaña de Principiante"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     victory_hour_of_code_done_yes: "Sí, rematei coa miña hora de código!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Guía"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     volume_label: "Volume"
     music_label: "Música"
     music_description: "Música de fondo activada/desactivada."
-    autorun_label: "Autorun"
-    autorun_description: "Control automático de código en execución."
     editor_config: "Conf. editor"
     editor_config_title: "Configuración do editor"
     editor_config_level_language_label: "Linguaxe para este nivel"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     nick_blurb: "Gurú Motivacional"
     michael_title: "Programador"
     michael_blurb: "Administrador de Sistemas"
-    matt_title: "Programador"
+    matt_title: "Programador" # {change}
     matt_blurb: "Ciclista"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/he.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     anonymous: "משתמש אנונימי"
     level_difficulty: "רמת קושי: "
     campaign_beginner: "מסע המתחילים"
-    awaiting_levels_adventurer_prefix: ".אנחנו מוסיפים חמישה שלבים בכל שבוע"
+    awaiting_levels_adventurer_prefix: ".אנחנו מוסיפים חמישה שלבים בכל שבוע" # {change}
     awaiting_levels_adventurer: "הירשם כהרפתקן"
     awaiting_levels_adventurer_suffix: ".כדי להיות הראשון שישחק בשלבים חדשים"
     adjust_volume: "שנה ווליום"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     victory_hour_of_code_done_yes: "שלי Hour of Code™! כן, סיימתי עם ה"
     victory_experience_gained: "שנצבר XP"
     victory_gems_gained: "אבני חן שנצברו"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "מדריך"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     feature4: "!בחינם כל חודש <strong>3500 אבני חן</strong>"
     feature5: "הדרכות וידאו"
     feature6: "תמיכת מייל בעדיפות ראשונה"
+#    feature7: "Private <strong>Clans</strong>"
     free: "חינם"
     month: "חודש"
     subscribe_title: "רכוש מנוי"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     volume_label: "ווליום"
     music_label: "מוזיקה"
     music_description: "כבה/הפעל מוזיקת רקע"
-    autorun_label: "הפעלה אוטומטית"
-    autorun_description: "שלוט בהפעלה אוטומטית של הקוד"
     editor_config: "תצורת(קונפיגורצית) עורך"
     editor_config_title: "תצורת(קונפיגורצית) עורך"
     editor_config_level_language_label: "שפה לשלב זה"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     nick_blurb: "גורו מוטיבציה"
     michael_title: "מתכנת"
     michael_blurb: "מנהל מערכת"
-    matt_title: "מתכנת"
+    matt_title: "מתכנת" # {change}
     matt_blurb: "רוכב אופניים"
     cat_title: "צ'יף אמן"
     cat_blurb: "כשף אוויר"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/hi.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/hu.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     anonymous: "Anonímusz Játékos"
     level_difficulty: "Nehézség: "
     campaign_beginner: "Kezdő Kampány"
-    awaiting_levels_adventurer_prefix: "Minden héten öt új pályát teszünk elérhetővé."
+    awaiting_levels_adventurer_prefix: "Minden héten öt új pályát teszünk elérhetővé." # {change}
     awaiting_levels_adventurer: "Jelentkezz fel mint Kalandor"
     awaiting_levels_adventurer_suffix: "legyél az első aki új pályákon játszik."
     adjust_volume: "Hangerő beállítása"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     victory_hour_of_code_done_yes: "Igen, ez volt életem kódja!"
     victory_experience_gained: "Szerzett tapasztalat"
     victory_gems_gained: "Szerzett Drágakövek"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Útmutató"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     feature4: "<strong>3500 bónusz drágakő</strong> minden hónapban!"
     feature5: "Videó oktatóanyagok"
     feature6: "Prémium email támogatás"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Ingyenes"
     month: "hónap"
     subscribe_title: "Feliratkozás"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     parent_email_title: "Mi a szülőd email címe?"
     parents: "Szülőknek"
     parents_title: "A gyereke programozni tanul majd." # {change}
-    parents_blurb1: "A CodeCombattal a gyereke valódi programozási feladatokon keresztül tanul. Egyszerű utasításokkal kezdenek, aztán további témákba is betekintést kapnak." # {change}
+    parents_blurb1: "A CodeCombattal a gyereke valódi programozási feladatokon keresztül tanul. Egyszerű utasításokkal kezdenek, aztán további témákba is betekintést kapnak."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "Havonta 9,99 USD-ért, minden héten új kihívások elé állítjuk őket és személyre szóló emailes támogatást nyújtanak enkik profi programozók." # {change}
     parents_blurb3: "100%-os pénzvisszafizetés garancia: 1-kattintásossal leiratkozhat."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     volume_label: "Hangerő"
     music_label: "Zene"
     music_description: "Háttérzene ki/bekapcsolása"
-    autorun_label: "Lefuttat"
-    autorun_description: "A kód szabályozott futtatása."
     editor_config: "Szerkesztő Config"
     editor_config_title: "Szerkesztő Beállítások"
     editor_config_level_language_label: "Nyelv a szinthez"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     nick_blurb: "Motivátor"
     michael_title: "Programozó"
     michael_blurb: "Rendszer Admin"
-    matt_title: "Programozó"
+    matt_title: "Programozó" # {change}
     matt_blurb: "Bringás"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     intro_1: "CodeCombat egy online játék, amelyik programozni tanít. A tanulók valódi programnyelven kódolnak."
     intro_2: "Előzetes tapasztalat nem szükséges!"
     free_title: "Mennyibe kerül?"
-    cost_china: "CodeCombat Kínában ingyenes az első 5 pályára, aztán $9.99 /hó, hogy elérhető legyen 120+ pálya az exkluzív kínai szervereken."
-    free_1: "CodeCombat Basic INGYENES! 70-nél is több pálya, amely minden tudást megad."
+    cost_china: "CodeCombat Kínában ingyenes az első 5 pályára, aztán $9.99 /hó, hogy elérhető legyen 120+ pálya az exkluzív kínai szervereken." # {change}
+    free_1: "CodeCombat Basic INGYENES! 70-nél is több pálya, amely minden tudást megad." # {change}
     free_2: "A havidíjas előfizetés hozzáférést biztosít az oktató videókhoz és az extra gyakoroló pályákhoz."
     teacher_subs_title: "Tanárok ingyenes előfizetést kapnak!"
     teacher_subs_1: "Lépjen kapcsolatba velünk,"
     teacher_subs_2: "hogy megkapja az ingyenes havi előfizetést."
     sub_includes_title: "Mit tartalmaz az előfizetés?"
     sub_includes_1: "A 80+ alap pályán kívül az előfizetéssel rendelkező tanulók az alábbi extrákhoz férnek hozzá:"
-    sub_includes_2: "50+ gyakorló pálya"
+    sub_includes_2: "50+ gyakorló pálya" # {change}
     sub_includes_3: "Oktató videók"
+#    sub_includes_7: "Private Clans"
     sub_includes_4: "Prémium támogatás emailen"
     sub_includes_5: "7 új hős egyedi képességekkel"
     sub_includes_6: "3500 bónusz drágakő minden hónapban"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     who_for_1: "A CodeCombat-ot 9 évesnél idősebb tanulóknak ajánljuk. Semmilyen programozási előismeret vagy tapasztalat nem szükséges."
     who_for_2: "Úgy terveztük meg a CodeCombat-ot, hogy fiúk és lányok számára is élvezetes legyen."
     material_title: "Mennyi anyagot tartalmaz?"
-    material_china: "Körülbelül 22 órányi játékidő a 120+ előfizetőknek járó pályákon, minden héten további 5 új pályával."
-    material_1: "Körülbelül 8 órányi ingyenes tartalom kiegészítve 14 órányi előfizetőknek járó tartalommal, minden héten további 5 új pályával."
+    material_china: "Körülbelül 22 órányi játékidő a 120+ előfizetőknek járó pályákon, minden héten további 5 új pályával." # {change}
+    material_1: "Körülbelül 8 órányi ingyenes tartalom kiegészítve 14 órányi előfizetőknek járó tartalommal, minden héten további 5 új pályával." # {change}
 #    concepts_title: "What concepts are covered?"
     how_much_title: "Mennyibe kerül a havi előfizetés?"
 #    how_much_1: "A"

app/locale/id.coffee

@@ -15,12 +15,12 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 
   nav:
     play: "Levels" # The top nav bar entry where players choose which levels to play
-    community: "Community"
+    community: "Komunitas"
     editor: "Editor"
     blog: "Blog"
     forum: "Forum"
     account: "Akun"
-    profile: "Profile"
+    profile: "Profil"
     stats: "Mulai"
     code: "Code"
     admin: "Admin" # Only shows up when you are an admin
@@ -33,7 +33,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    teachers: "Teachers"
 
   modal:
-    close: "Close"
+    close: "Tutup"
     okay: "Okay"
 
   not_found:
@@ -42,8 +42,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
   diplomat_suggestion:
 #    title: "Help translate CodeCombat!" # This shows up when a player switches to a non-English language using the language selector.
 #    sub_heading: "We need your language skills."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Indonesian but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Indonesian."
-    missing_translations: "Until we can translate everything into Indonesian, you'll see English when Indonesian isn't available."
+    pitch_body: "Kami mengembangkan CodeCombat dalam bahasa Inggris, tapi kami sudah memiliki pemain di seluruh dunia. Banyak dari mereka ingin bermain di Indonesia, tetapi tidak berbicara bahasa Inggris, jadi jika Anda dapat berbicara, silakan mempertimbangkan untuk mendaftar untuk menjadi Diplomat dan membantu menerjemahkan kedua situs CodeCombat dan semua tingkatan ke Indonesia."
+    missing_translations: "Hingga kami bisa menerjemahkan semuanya ke dalam bahasa Indonesia, Anda akan melihat bahasa Inggris ketika Indonesia belum tersedia."
 #    learn_more: "Learn more about being a Diplomat"
 #    subscribe_as_diplomat: "Subscribe as a Diplomat"
 
@@ -58,12 +58,12 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    owned: "Owned" # For items you own
     locked: "Terkunci"
 #    purchasable: "Purchasable" # For a hero you unlocked but haven't purchased
-    available: "Trsedia"
+    available: "Tersedia"
 #    skills_granted: "Skills Granted" # Property documentation details
     heroes: "Heroes" # Tooltip on hero shop button from /play
 #    achievements: "Achievements" # Tooltip on achievement list button from /play
     account: "Akun" # Tooltip on account button from /play
-    settings: "Settings" # Tooltip on settings button from /play
+    settings: "Pengaturan" # Tooltip on settings button from /play
 #    poll: "Poll" # Tooltip on poll button from /play
 #    next: "Next" # Go from choose hero to choose inventory before playing a level
 #    change_hero: "Change Hero" # Go back from choose inventory to choose hero
@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-    awaiting_levels_adventurer_prefix: "Kami meliris lima level per minggu"
+    awaiting_levels_adventurer_prefix: "Kami meliris lima level per minggu" # {change}
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/it.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     anonymous: "Giocatore Anonimo"
     level_difficulty: "Difficoltà: "
     campaign_beginner: "Campagne per principianti"
-    awaiting_levels_adventurer_prefix: "Pubblichiamo 5 livelli alla settimana."
+    awaiting_levels_adventurer_prefix: "Pubblichiamo 5 livelli alla settimana." # {change}
     awaiting_levels_adventurer: "Iscriviti come Avventuriero"
     awaiting_levels_adventurer_suffix: "per essere tra i primi a provare i nuovi livelli."
     adjust_volume: "Regola il volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     victory_hour_of_code_done_yes: "Si, ho finito con la mia ora di programmazione!"
     victory_experience_gained: "Punti XP guadagnati"
     victory_gems_gained: "Gemme guadagnate"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Guida"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     feature4: "<strong>3500 gemme bonus</strong> ogni mese!"
     feature5: "Video tutorial"
     feature6: "Supporto via email premium"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Gratis"
     month: "mese"
     subscribe_title: "Sottoscrivi"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     volume_label: "Volume"
     music_label: "Musica"
     music_description: "Accendi/spegni musica di sottofondo."
-    autorun_label: "Autorun"
-    autorun_description: "Controlla l'esecuzione automatica del codice."
     editor_config: "Config editor"
     editor_config_title: "Configurazione editor"
     editor_config_level_language_label: "Lingua per questo livello"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    nick_blurb: "Motivation Guru"
     michael_title: "Programmatore"
     michael_blurb: "Amministratore di sistema"
-    matt_title: "Programmatore"
+    matt_title: "Programmatore" # {change}
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/ja.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     anonymous: "名無しのプレイヤー"
     level_difficulty: "難易度: "
     campaign_beginner: "初心者のキャンペーン"
-    awaiting_levels_adventurer_prefix: "私たちは週に5つのレベルをリリースします"
+    awaiting_levels_adventurer_prefix: "私たちは毎週新しいレベルをリリースします"
     awaiting_levels_adventurer: "冒険者として登録すると、"
     awaiting_levels_adventurer_suffix: "新たなレベルを最初に遊ぶ事ができます"
     adjust_volume: "音量を調整する"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     victory_hour_of_code_done_yes: "はい、構いません"
     victory_experience_gained: "XP獲得"
     victory_gems_gained: "ジェム獲得"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "ガイド"
@@ -358,7 +359,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 
   leaderboard:
     leaderboard: "リーダーボード"
-    view_other_solutions: "他のソリューションを見る" # {change}
+    view_other_solutions: "リーダーボードを見る"
     scores: "スコア"
     top_players: "上位プレイヤー順"
     day: "今日"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     volume_label: "音量"
     music_label: "音楽"
     music_description: "BGM をオン/オフ"
-    autorun_label: "自動実行"
-    autorun_description: "自動実行の設定"
     editor_config: "エディター設定"
     editor_config_title: "エディターの設定"
     editor_config_level_language_label: "このレベルの言語"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     nick_blurb: "モチベーションの達人"
     michael_title: "プログラマー"
     michael_blurb: "システム管理者"
-    matt_title: "プログラマー"
+    matt_title: "プログラマー" # {change}
     matt_blurb: "サイクリスト"
     cat_title: "チーフアルティザン"
     cat_blurb: "エアベンダー"
@@ -586,8 +586,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     intro_1: "CodeCombat はプログラミングを教えるオンラインゲームです。生徒は本物のプログラム言語を書きます。"
     intro_2: "プログラミングの経験は必要ありません！"
     free_title: "価格について"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-    free_1: "CodeCombat は基本的に無料です！70以上のレベルが無料です。"
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+    free_1: "CodeCombat は基本的に無料です！80以上のレベルが無料です。"
     free_2: "月々の課金をするとビデオのチュートリアルにアクセスでき、また追加のレベルが楽しめます。"
     teacher_subs_title: "教育関係者は無料のサブスクリプションを得ることができます！"
     teacher_subs_1: ""
@@ -596,6 +596,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     sub_includes_1: "70以上の基本レベルに加えて、生徒は月々のサブスクリプションを得て次の機能が使えます:" # {change}
     sub_includes_2: "40以上の練習レベル" # {change}
     sub_includes_3: "ビデオチュートリアル"
+#    sub_includes_7: "Private Clans"
     sub_includes_4: "メールによるサポート"
     sub_includes_5: "7人の新しいヒーローとマスターのユニークなスキル"
     sub_includes_6: "3500のジェムが月々支給されます"
@@ -603,7 +604,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     who_for_1: "私たちは CodeCombat を9歳以上の生徒にオススメしています。プログラミングの経験は必要ありません。"
     who_for_2: "私たちは男女問わず遊べるように CodeCombat をデザインしました。"
     material_title: "どのぐらいコンテンツがありますか？"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
     material_1: "8時間ほどの無料のコンテンツに加え、サブスクリプションによってさらに14時間ほどプレイすることができ、毎週5つの新しいレベルが追加されています。" # {change}
     concepts_title: "どのような概念がカバーされているかについて"
     how_much_title: "月々のサブスクリプションはいくらですか？"
@@ -836,8 +837,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
   contribute:
     page_title: "コントリビュート"
     intro_blurb: "CodeCombat は100%オープンソースです！何百もの熱心なプレイヤーが私たちがゲームを作るのを手伝っています。私たちと一緒に CodeCombat の次のチャプターを作って世界中のプレイヤーにプログラミングを教えましょう！"
-#    alert_account_message_intro: "Hey there!"
-#    alert_account_message: "To subscribe for class emails, you'll need to be logged in first."
+    alert_account_message_intro: "やあ、こんにちは!"
+    alert_account_message: "クラスのメールを購読するには,まずログインが必要です。"
     archmage_introduction: "ゲームを作る上で一番重要なのは、たくさんの要素を合成することです。グラフィック、サウンド、リアルタイムネットワーキング、ソーシャルネットワーキング、一般的なプログラミング、ローレベルのデータベースマネジメント、管理画面のデザインやインターフェイスなど多岐に渡ります。やらなくてはいけないことはたくさんあります。もしあなたが経験豊富なプログラマであればアーキメイジになって CodeCombat のコアにコミットしましょう。ぜひとも私たちの最高のプログラミングゲームを手伝ってください。"
     class_attributes: "クラスの属性"
     archmage_attribute_1_pref: ""
@@ -851,24 +852,24 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     join_url_email: "メール"
     join_url_hipchat: "公開の HipChat のルーム"
     archmage_subscribe_desc: "コーディングの機会やアナウンスをメールで受け取る"
-#    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: ", then this class might be for you."
-#    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
-#    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
-#    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
-#    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
-#    artisan_join_step1: "Read the documentation."
-#    artisan_join_step2: "Create a new level and explore existing levels."
-#    artisan_join_step3: "Find us in our public HipChat room for help."
-#    artisan_join_step4: "Post your levels on the forum for feedback."
-#    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
-#    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
-#    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
-#    adventurer_attribute_2: "Charismatic. Be gentle but articulate about what needs improving, and offer suggestions on how to improve."
-#    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
-#    adventurer_forum_url: "our forum"
-#    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    adventurer_subscribe_desc: "Get emails when there are new levels to test."
+    artisan_introduction_pref: "私たちは、追加のレベルを建設しなければなりません！皆さんはもっとコンテンツを、と叫んでいますが、私達がつくれるのは自分たちの分だけです。今、あなたのワークステーションはレベル１です。私達のレベルエディタをつかえばそんなクリエイターでもギリギリ使えます、そう警戒しないで。あなたがfor-loopにまたがるキャンペーンのビジョンを"
+    artisan_introduction_suf: "にもっているなら、このクラスはあなたにピッタリです。"
+    artisan_attribute_1: "Blizzardのレベルエディタなどの構築経験は歓迎しますが、必須ではありません!"
+    artisan_attribute_2: "全体のテストを何度もすることを願ってます。 よいレベルを作るには 他の人のを真似て見てプレイしてみることが必要です。そしてそこから修正のための多くのものを見つけて準備しましょう。"
+    artisan_attribute_3: "時間がかかることで, 冒険者と並ぶくらい我慢しなければなりません。 私達のレベルエディターは予備動作が長く使っているとイライラするかもしれません。気をつけてくださいね!"
+    artisan_join_desc: "レベルエディタを使うために以下のステップを利用してください。"
+    artisan_join_step1: "ドキュメントを読む"
+    artisan_join_step2: "新しいレベルを作成し、すでにあるレベルか探す"
+    artisan_join_step3: "ヘルプが必要なとき公開HipChatルームで私達を探す"
+    artisan_join_step4: "フィードバックのためフォーラムにあなたのレベルを投稿する"
+    artisan_subscribe_desc: "レベルエディタアップデートやアナウンスをメールで受け取る"
+    adventurer_introduction: "あなたの役割をはっきりしましょう。あなたは戦車です。あなたには大きなダメージを負ってもらいます。私たちには新しいレベルを試し、どう改善するか見分けるの役立つ人が必要です。その苦痛は大きなものです。よいゲームを作ることは長い道のりで、最初から正しく動くものなどないのです。もしあなたが耐えることができ、高い生命力を持っているならこのクラスはあなたにピッタリでしょう。"
+    adventurer_attribute_1: "学習することへの渇き。あなたがコーディングのやり方を学びたいなら私たちはコーディングの方法を教えたいと思っています。おそらくこの授業のほとんどを受けているでしょうけど。"
+    adventurer_attribute_2: "カリスマ。紳士的であり、改善に必要なことをはっきり表し、改善する方法について提案をします。"
+    adventurer_join_pref: "アーチザンを獲得（新会員に）し彼らと働き、テストをし新しいレベルがあるときにメールを受信するには以下のチェックボックスをオンにしてください。また、私達はレベルのレビューの投稿をを私達のネットワーク"
+    adventurer_forum_url: "フォーラム"
+    adventurer_join_suf: "などで通知する場合はそこでもサインアップをしてください。"
+    adventurer_subscribe_desc: "新しいレベルをテストするためのメールを受け取る。"
 #    scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
 #    scribe_introduction_url_mozilla: "Mozilla Developer Network"
 #    scribe_introduction_suf: " has built. If your idea of fun is articulating the concepts of programming in Markdown form, then this class might be for you."
@@ -912,17 +913,17 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    games_simulated_for: "Games simulated for you:"
 #    games_simulated: "Games simulated"
 #    games_played: "Games played"
-#    ratio: "Ratio"
-#    leaderboard: "Leaderboard"
+    ratio: "比率  "
+    leaderboard: "リーダーボード"
 #    battle_as: "Battle as "
     summary_your: "あなたの "
     summary_matches: "戦闘数 - "
     summary_wins: " 勝利数, "
     summary_losses: " 敗北数"
-#    rank_no_code: "No New Code to Rank"
+    rank_no_code: "新しいコードがランクにありません"
 #    rank_my_game: "Rank My Game!"
-#    rank_submitting: "Submitting..."
-#    rank_submitted: "Submitted for Ranking"
+    rank_submitting: "送信中..."
+    rank_submitted: "ランキングに送信されました。"
 #    rank_failed: "Failed to Rank"
 #    rank_being_ranked: "Game Being Ranked"
 #    rank_last_submitted: "submitted "

app/locale/ko.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    anonymous: "Anonymous Player"
     level_difficulty: "난이도: "
     campaign_beginner: "초보자 캠페인"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
     awaiting_levels_adventurer_suffix: "새로운 레벨을 가장 먼저 체험하세요!"
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     victory_hour_of_code_done_yes: "네 내 Hour of Code™ 완료했습니다!"
     victory_experience_gained: "획득한 경험치"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "가이드"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     volume_label: "볼륨"
     music_label: "음악"
     music_description: "배경음악 ON/OFF"
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
     editor_config: "에디터 설정"
     editor_config_title: "에디터 설정"
     editor_config_level_language_label: "이 레벨에서 사용할 언어"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    nick_blurb: "Motivation Guru"
     michael_title: "프로그래머"
 #    michael_blurb: "Sys Admin"
-    matt_title: "프로그래머"
+    matt_title: "프로그래머" # {change}
     matt_blurb: "자전거 타는 사람"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/lt.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/mk-MK.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     anonymous: "Анонимен играч"
     level_difficulty: "Тешкотија: "
     campaign_beginner: "Почетничка кампања"
-    awaiting_levels_adventurer_prefix: "Пуштаме пет нивоа неделно."
+    awaiting_levels_adventurer_prefix: "Пуштаме пет нивоа неделно." # {change}
     awaiting_levels_adventurer: "Зачлени се како Авантурист"
     awaiting_levels_adventurer_suffix: "за да бидеш првиот кој ќе ги игра новите нивоа."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
     victory_experience_gained: "Добиено искуство"
     victory_gems_gained: "Добиени скапоцени камења"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Водич"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
     subscribe_title: "Зачлени се"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    parent_email_title: "What's your parent's email?"
     parents: "За родители"
     parents_title: "Вашето дете ќе научи да програмира." # {change}
-    parents_blurb1: "Со CodeCombat, вашите деца учат преку пишување на вистински програмски код. Почнуваат со учење на едноставни команди, по што се продолжува на понапредни теми." # {change}
+    parents_blurb1: "Со CodeCombat, вашите деца учат преку пишување на вистински програмски код. Почнуваат со учење на едноставни команди, по што се продолжува на понапредни теми."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "За $9.99 американски долари месечно, добиваат нови предизвици секоја недела и лична поддршка преку e-mail, од страна на професионални програмери." # {change}
     parents_blurb3: "Без ризик: 100% гаранција за враќање на парите, лесно откажување на членството со еден клик."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     volume_label: "Јачина на звук"
     music_label: "Музика"
     music_description: "Вклучи/Исклучи позадинска музика."
-    autorun_label: "Автоматско извршување"
-    autorun_description: "Контрола на автоматско извршување на кодот."
     editor_config: "Подесувања на едитор"
     editor_config_title: "Подесувања на едитор"
     editor_config_level_language_label: "Јазик за ова ниво"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     nick_blurb: "Мотивациски гуру"
     michael_title: "Програмер"
     michael_blurb: "Систем администратор"
-    matt_title: "Програмер"
+    matt_title: "Програмер" # {change}
     matt_blurb: "Бициклист"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/ms.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/nb.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     anonymous: "Anonym Spiller"
     level_difficulty: "Vanskelighetsgrad: "
     campaign_beginner: "Begynner Felttog"
-    awaiting_levels_adventurer_prefix: "Vi lanserer fem nye brett hver uke"
+    awaiting_levels_adventurer_prefix: "Vi lanserer fem nye brett hver uke" # {change}
     awaiting_levels_adventurer: "Registrer deg som Eventyrer"
     awaiting_levels_adventurer_suffix: "for å få spille nye brett før alle andre."
     adjust_volume: "Juster lydnivå"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     victory_hour_of_code_done_yes: "Ja, jeg er ferdig med min Kodetime!"
     victory_experience_gained: "XP Opparbeidet"
     victory_gems_gained: "Mottatte juveler"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Guide"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     feature4: "<strong>3500 bonusjuveler</strong> hver måned!"
     feature5: "Videoveiledninger"
     feature6: "Premium e-poststøtte"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Gratis"
     month: "måned"
     subscribe_title: "Abonnér"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     parent_email_title: "Hva er din forelders e-postadresse?"
     parents: "For foreldre"
     parents_title: "Barnet ditt vil lære å kode" # {change}
-    parents_blurb1: "Med CodeCombat vil dine barn lære seg å skrive ekte kode. De begynner med enkle kommandoer og går videre til mer avanserte emner." # {change}
+    parents_blurb1: "Med CodeCombat vil dine barn lære seg å skrive ekte kode. De begynner med enkle kommandoer og går videre til mer avanserte emner."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "For USD 9.99 pr mnd, vil de få nye utfordringer hver uke og personlig e-poststøtte fra profesjonelle programmerere." # {change}
     parents_blurb3: "Ingen risiko: 100% pengene tilbake-garanti, kun et klikk for å si opp abonnementet."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     volume_label: "Volum"
     music_label: "Musikk"
     music_description: "Bakgrunnsmusikk på/av."
-    autorun_label: "Auto-kjør"
-    autorun_description: "Kontroller automatisk kode-kjøring."
     editor_config: "Editor Oppsett"
     editor_config_title: "Editor Oppsett"
     editor_config_level_language_label: "Språk for dette brettet"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     nick_blurb: "Motivasjonsguru"
     michael_title: "Programmerer"
     michael_blurb: "Systemadministrator"
-    matt_title: "Programmerer"
+    matt_title: "Programmerer" # {change}
     matt_blurb: "Syklist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/nl-BE.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     anonymous: "Anonieme speler"
     level_difficulty: "Moeilijkheidsgraad: "
     campaign_beginner: "Beginnercampagne"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     victory_hour_of_code_done_yes: "Ja, ik ben klaar met mijn Hour of Code!"
     victory_experience_gained: "XP verdiend"
     victory_gems_gained: "Juwelen verdiend"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Handleiding"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
     editor_config: "Editor Configuratie"
     editor_config_title: "Editor Configuratie"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/nl-NL.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     anonymous: "Anonieme Speler"
     level_difficulty: "Moeilijkheidsgraad: "
     campaign_beginner: "Beginnercampagne"
-    awaiting_levels_adventurer_prefix: "We brengen 5 nieuwe levels per week uit."
+    awaiting_levels_adventurer_prefix: "We brengen 5 nieuwe levels per week uit." # {change}
     awaiting_levels_adventurer: "Schrijf je in als Avonturier"
     awaiting_levels_adventurer_suffix: "om de eerste te zijn die nieuwe levels speelt."
     adjust_volume: "Volume aanpassen"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     victory_hour_of_code_done_yes: "Ja, ik ben klaar met mijn Hour of Code!"
     victory_experience_gained: "XP verdient"
     victory_gems_gained: "Edelstenen verdient"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Handleiding"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
     subscribe_title: "Abonneren"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    parent_email_title: "What's your parent's email?"
     parents: "Voor ouders"
     parents_title: "Uw kind leert programmeren." # {change}
-    parents_blurb1: "Met CodeCombat leert uw kind door echte code te schrijven. Ze beginnen met simpele instructies en naarmate ze verder komen, komen er moeilijkere onderwerpen aan bod." # {change}
+    parents_blurb1: "Met CodeCombat leert uw kind door echte code te schrijven. Ze beginnen met simpele instructies en naarmate ze verder komen, komen er moeilijkere onderwerpen aan bod."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
 #    parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
     editor_config: "Editor Configuratie"
     editor_config_title: "Editor Configuratie"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     nick_blurb: "Motivatie Goeroe"
     michael_title: "Programmeur"
     michael_blurb: "Systeembeheerder"
-    matt_title: "Programmeur"
+    matt_title: "Programmeur" # {change}
     matt_blurb: "Fietser"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/nn.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/pl.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     anonymous: "Anonimowy gracz"
     level_difficulty: "Poziom trudności: "
     campaign_beginner: "Kampania dla początkujących"
-    awaiting_levels_adventurer_prefix: "Wydajemy pięć poziomów na tydzień."
+    awaiting_levels_adventurer_prefix: "Wydajemy pięć poziomów na tydzień." # {change}
     awaiting_levels_adventurer: "Zapisz się jako Podróżnik"
     awaiting_levels_adventurer_suffix: "aby jako pierwszy grać nowe poziomy."
     adjust_volume: "Dopasuj głośność"
@@ -161,7 +161,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 
   general:
     and: "i"
-    name: "Imię"
+    name: "Nazwa"
     date: "Data"
     body: "Zawartość"
     version: "Wersja"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     victory_hour_of_code_done_yes: "Tak, skończyłem moją Godzinę Kodu."
     victory_experience_gained: "Doświadczenie zdobyte"
     victory_gems_gained: "Klejnoty zdobyte"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Przewodnik"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     volume_label: "Głośność"
     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: "Język dla tego poziomu"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    nick_blurb: "Motivation Guru"
     michael_title: "Programista"
 #    michael_blurb: "Sys Admin"
-    matt_title: "Programista"
+    matt_title: "Programista" # {change}
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/pt-BR.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     anonymous: "Jogador Anônimo"
     level_difficulty: "Dificuldade: "
     campaign_beginner: "Campanha Iniciante"
-    awaiting_levels_adventurer_prefix: "Nós liberamos cinco níveis por semana."
+    awaiting_levels_adventurer_prefix: "Nós liberamos cinco níveis por semana." # {change}
     awaiting_levels_adventurer: "Cadastre-se como um aventureiro"
     awaiting_levels_adventurer_suffix: "para ser o primeiro a jogar as novas fases."
     adjust_volume: "Ajuste o volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     victory_hour_of_code_done_yes: "Sim, eu terminei minha Hora da Programação!"
     victory_experience_gained: "XP ganho"
     victory_gems_gained: "Gems ganhas"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Guia"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     feature4: "<strong>3500 gemas bônus</strong> todo mês!"
     feature5: "Vídeo tutorials"
     feature6: "Suporte via e-mail Premium"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Grátis"
     month: "mês"
     subscribe_title: "Inscrever-se"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     parent_email_title: "Qual é o e-mail dos seus pais?"
     parents: "Para os pais"
     parents_title: "Seus filhos estão aprendendo a programar." # {change}
-    parents_blurb1: "Com o CodeCombat, seus filhos aprendem a programar de verdade. Eles começam a aprender comandos simples, e progridem para tópicos avançados." # {change}
+    parents_blurb1: "Com o CodeCombat, seus filhos aprendem a programar de verdade. Eles começam a aprender comandos simples, e progridem para tópicos avançados."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "Apenas $9.99 USD/mês, eles recebem novos desafios todo mês e suporte no email pessoal de programadores profissionais." # {change}
     parents_blurb3: "Sem risco: 100% devolução do dinheiro garantida, basta um simples clique em desinscrever-se."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     volume_label: "Volume"
     music_label: "Música"
     music_description: "Ligar/desligar música de fundo."
-    autorun_label: "Rodar automaticamente"
-    autorun_description: "Controlar execução automática do código."
     editor_config: "Editor de Configurações"
     editor_config_title: "Editor de Configurações"
     editor_config_level_language_label: "Linguagem para este nível"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     nick_blurb: "Guru Motivacional"
     michael_title: "Programador"
     michael_blurb: "Administrador de Sistemas"
-    matt_title: "Programador"
+    matt_title: "Programador" # {change}
     matt_blurb: "O Ciclista"
     cat_title: "Chefe Artesão"
     cat_blurb: "Corta-vento"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/pt-PT.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     anonymous: "Jogador Anónimo"
     level_difficulty: "Dificuldade: "
     campaign_beginner: "Campanha para Iniciantes"
-    awaiting_levels_adventurer_prefix: "Nós adicionamos cinco níveis por semana."
+    awaiting_levels_adventurer_prefix: "Nós lançamos novos níveis todas as semanas."
     awaiting_levels_adventurer: "Regista-te como Aventureiro"
     awaiting_levels_adventurer_suffix: "para seres o primeiro a jogar níveis novos."
     adjust_volume: "Ajustar volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     victory_hour_of_code_done_yes: "Sim, terminei a minha Hora do Código™!"
     victory_experience_gained: "XP Ganho"
     victory_gems_gained: "Gemas Ganhas"
+    victory_new_item: "Novo Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Torna-te um Viking"
     guide_title: "Guia"
@@ -315,7 +316,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     tip_no_try: "Fazer. Ou não fazer. Não há nenhum tentar. - Yoda"
     tip_patience: "Paciência tu deves ter, jovem Padawan. - Yoda"
     tip_documented_bug: "Um erro documentado não é um erro; é uma funcionalidade."
-    tip_impossible: "Parece sempre impossível até ser feito. - Nelson Mandela"
+    tip_impossible: "Tudo parece sempre impossível até ser feito. - Nelson Mandela"
     tip_talk_is_cheap: "Falar é fácil. Mostra-me o código. - Linus Torvalds"
     tip_first_language: "A coisa mais desastrosa que podes aprender é a tua primeira linguagem de programação. - Alan Kay"
     tip_hardware_problem: "P: Quantos programadores são necessários para mudar uma lâmpada?  R: Nenhum, é um problema de hardware."
@@ -324,7 +325,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     tip_brute_force: "Quando em dúvida, usa a força bruta. - Ken Thompson"
     tip_extrapolation: "Há apenas dois tipos de pessoas: aquelas que conseguem tirar uma conclusão a partir de dados reduzidos..."
     tip_superpower: "A programação é a coisa mais próxima de um superpoder que temos."
-    tip_control_destiny: "Em open source a sério, tens o direito de controlares o teu próprio destino. - Linus Torvalds"
+    tip_control_destiny: "Em 'open source' a sério, tens o direito de controlares o teu próprio destino. - Linus Torvalds"
     tip_no_code: "Nenhum código é mais rápido que código não existente."
     tip_code_never_lies: "O código nunca mente, mas os comentários às vezes sim. — Ron Jeffries"
     tip_reusable_software: "Antes de um software poder ser reutilizável, primeiro tem de ser utilizável."
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     comparison_blurb: "Aperfeiçoa as tuas habilidades com uma subscrição do CodeCombat!"
     feature1: "80+ níveis básicos dispersos por 4 mundos"
     feature2: "7 <strong>heróis novos</strong> e poderosos com habilidades únicas!"
-    feature3: "50+ níveis de bónus"
+    feature3: "60+ níveis de bónus"
     feature4: "<strong>3500 gemas de bónus</strong> por mês!"
     feature5: "Tutoriais em vídeo"
     feature6: "Apoio por e-mail superior"
+    feature7: "<strong>Clãs</strong> Privados"
     free: "Grátis"
     month: "mês"
     subscribe_title: "Subscrever"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     volume_label: "Volume"
     music_label: "Música"
     music_description: "Ativar ou desativar a música de fundo."
-    autorun_label: "Executar Automaticamente"
-    autorun_description: "Controlar a execução automática do código."
     editor_config: "Configurar Editor"
     editor_config_title: "Configurar Editor"
     editor_config_level_language_label: "Linguagem para Este Nível"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     nick_blurb: "Guru da Motivação"
     michael_title: "Programador"
     michael_blurb: "Administrador do Sistema"
-    matt_title: "Programador"
+    matt_title: "Co-fundador"
     matt_blurb: "Ciclista"
     cat_title: "Artesã Chefe"
     cat_blurb: "Mágica"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     intro_1: "O CodeCombat é um jogo 'online' que ensina programação. Os estudantes escrevem código em linguagens de programação reais."
     intro_2: "Não é necessário ter experiência!"
     free_title: "Quanto custa?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
     teacher_subs_title: "Os professores recebem uma subscrição gratuita!"
     teacher_subs_1: "Por favor, contacta"
     teacher_subs_2: "para te arranjarmos uma subscrição mensal gratuita."
     sub_includes_title: "O que está incluído na subscrição?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
     material_title: "Quanto material há?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
     concepts_title: "Que conceitos são abordados?"
     how_much_title: "Quanto custa uma subscrição mensal?"
     how_much_1: "Uma"

app/locale/ro.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    anonymous: "Anonymous Player"
     level_difficulty: "Dificultate: "
     campaign_beginner: "Campanie pentru Începători"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     victory_hour_of_code_done_yes: "Da, am terminat Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Ghid"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
     editor_config: "Editor Config"
     editor_config_title: "Configurare Editor"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/ru.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     anonymous: "Неизвестный игрок"
     level_difficulty: "Сложность: "
     campaign_beginner: "Кампания для новичков"
-    awaiting_levels_adventurer_prefix: "Мы выпускаем по 5 уровней в неделю."
+    awaiting_levels_adventurer_prefix: "Мы выпускаем новые уровни каждую неделю."
     awaiting_levels_adventurer: "Зарегистрируйтесь в качестве Искателя приключений"
     awaiting_levels_adventurer_suffix: "чтобы первым поиграть в новые уровни."
     adjust_volume: "Регулировать громкость"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     victory_hour_of_code_done_yes: "Да, я закончил мой Час Кода™!"
     victory_experience_gained: "Опыта получено"
     victory_gems_gained: "Самоцветов получено"
+    victory_new_item: "Новый предмет"
     victory_viking_code_school: "Ого, это было тяжелый уровень! Если вы еще не разработчик программ, вам стоит им стать. Вы только что ускорири принятие в Школу Викингов, где вы сможете поднять свои навыки на новый уровень и стать профессиональным веб-разработчиком за 14 недель."
     victory_become_a_viking: "Станьте Викингом"
     guide_title: "Руководство"
@@ -273,7 +274,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tome_submit_button: "Завершить"
     tome_reload_method: "Загрузить оригинальный код для этого метода" # Title text for individual method reload button.
     tome_select_method: "Выбрать метод"
-    tome_see_all_methods: "Показать все методы, доступные для редактирования" # Title text for method list selector (shown when there are multiple programmable methdos).
+    tome_see_all_methods: "Показать все методы, доступные для редактирования" # Title text for method list selector (shown when there are multiple programmable methods).
     tome_select_a_thang: "Выбрать кого-нибудь для "
     tome_available_spells: "Доступные заклинания"
     tome_your_skills: "Ваши навыки"
@@ -290,6 +291,11 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     time_current: "Текущее:"
     time_total: "Максимальное:"
     time_goto: "Перейти на:"
+    non_user_code_problem_title: "Невозможно загрузить уровень"
+    infinite_loop_title: "Обнаружен бесконечный цикл"
+    infinite_loop_description: "Код сотворения мира не завершил выполнение. Это могло случиться из-за реально медленного кода или наличия бесконечного цикла. Или там может быть баг. Вы можете попытаться запустить этот код еще раз или сбросить код в состояние по умолчанию. Если проблема не будет решена, дайте нам знать."
+    check_dev_console: "Вы так же можете открыть консоль разработчика, чтобы увидеть, что может идти не так."
+    check_dev_console_link: "(инструкции)"
     infinite_loop_try_again: "Попробовать снова"
     infinite_loop_reset_level: "Сбросить уровень"
     infinite_loop_comment_out: "Закомментировать мой код"
@@ -400,10 +406,11 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     comparison_blurb: "Отточите свое мастерство благодаря подписке на CodeCombat!"
     feature1: "80+ основных уровней на просторах 4-х миров"
     feature2: "7 могущественных <strong>новых героев</strong> с уникальными способностями!"
-    feature3: "50+ дополнительных уровней"
+    feature3: "60+ дополнительных уровней"
     feature4: "<strong>3500 бонусных самоцветов</strong> каждый месяц!"
     feature5: "Обучающие видеоролики"
     feature6: "Эксклюзивная поддержка по электронной почте"
+    feature7: "Частные <strong>Кланы</strong>"
     free: "Бесплатно"
     month: "месяц"
     subscribe_title: "Подпишись"
@@ -445,6 +452,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     was_free_until: "Вы имели бесплатную подписку до"
     managed_subs: "Управляемые подписки"
     managed_subs_desc: "Добавьте подписки для других игроков (студенты, дети и т.д.)"
+    managed_subs_desc_2: "Получатели должны иметь аккаунт CodeCombat, связанный с email-адресом, указанным вами."
     group_discounts: "Групповые скидки"
     group_discounts_1: "Так же мы предлагаем групповые скидки для нескольких подписок."
     group_discounts_1st: "1-я подписка"
@@ -528,8 +536,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     volume_label: "Громкость"
     music_label: "Музыка"
     music_description: "Фоновая музыка вкл/выкл"
-    autorun_label: "Автозапуск"
-    autorun_description: "Настройка автоматического выполнения кода."
     editor_config: "Настройки редактора"
     editor_config_title: "Настройки редактора"
     editor_config_level_language_label: "Язык для этого уровня"
@@ -570,7 +576,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     nick_blurb: "Гуру мотивации"
     michael_title: "Программист"
     michael_blurb: "Сисадмин"
-    matt_title: "Программист"
+    matt_title: "Сооснователь"
     matt_blurb: "Велосипедист"
     cat_title: "Главный ремесленник"
     cat_blurb: "Повелитель стихий"
@@ -586,27 +592,28 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     intro_1: "CodeCombat - это онлайн игра, которая обучает программированию. Ученики пишут код на реальных языках программирования."
     intro_2: "Опыт не обязателен!"
     free_title: "Сколько это стоит?"
-    cost_china: "Первые 5 уровней CodeCombat бесплатны в Китае. При оплате $9.99 в месяц вы получите доступ к последующим более чем 120 уровням на наших эксклюзивных серверах в Китае."
-    free_1: "CodeCombat (его базовая часть) бесплатен! В наличии более 70 уровней, которые покрывают каждый концепт."
+    cost_china: "Первые 5 уровней CodeCombat бесплатны в Китае. При оплате $9.99 в месяц вы получите доступ к последующим более чем 140 уровням на наших эксклюзивных серверах в Китае."
+    free_1: "CodeCombat (его базовая часть) бесплатен! В наличии более 80 уровней, которые покрывают каждый концепт."
     free_2: "Месячная подписка предоставляет доступ к видео-урокам и дополнительным уровням."
     teacher_subs_title: "Учителя получают бесплатные подписки!"
     teacher_subs_1: "Пожалуйста, напишите на"
     teacher_subs_2: "для получения бесплатной месячной подписки."
     sub_includes_title: "Что включено в подписку?"
     sub_includes_1: "В дополнение к более чем 80 бесплатным уровням ученики с месячной подпиской получат доступ к дополнительным возможностям:"
-    sub_includes_2: "Более 50 уровней для дополнительной практики"
+    sub_includes_2: "Более 60 уровней для дополнительной практики"
     sub_includes_3: "Видео-уроки"
     sub_includes_4: "Эксклюзивная поддержка по электронной почте"
     sub_includes_5: "7 новых героев с уникальными возможностями для оттачивания мастерства"
     sub_includes_6: "3500 бонусных самоцветов каждый месяц"
+    sub_includes_7: "Частные Кланы"
     who_for_title: "Для кого предназначен CodeCombat?"
     who_for_1: "Мы рекомендуем CodeCombat для учеников старше 9 лет. Какой-либо опыт программирования не требуется."
     who_for_2: "Мы разработали CodeCombat так, чтобы он подходил и мальчикам и девочкам."
     material_title: "Как много здесь материала?"
-    material_china: "Около 22 часов игрового процесса, распределенного более чем на 120 уровней для подписчиков с добавлением 5 уровней каждую неделю."
-    material_1: "Около 8 часов бесплатного контента и 14 часов дополнительного контента для подписчиков с добавлением 5 уровней каждую неделю."
-    concepts_title: "О каких концептах мы рассказываем? What concepts are covered?"
-    how_much_title: "How much does a monthly subscription cost?"
+    material_china: "Около 30 часов игрового процесса, распределенного более чем на 140 уровней для подписчиков с добавлением новых уровней каждую неделю."
+    material_1: "Около 10 часов бесплатного контента и 20 часов дополнительного контента для подписчиков с добавлением новых уровней каждую неделю."
+    concepts_title: "О каких концептах мы рассказываем?"
+    how_much_title: "Сколько стоит месячная подписка?"
     how_much_1: "Цена"
     how_much_2: "месячной подписки"
     how_much_3: "- $9.99. Подписка может быть отменена в любой момент."

app/locale/sk.coffee

@@ -42,8 +42,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
   diplomat_suggestion:
     title: "Pomôžte preložiť CodeCombat!" # This shows up when a player switches to a non-English language using the language selector.
     sub_heading: "Potrebujeme tvoje jazykové zručnosti."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Slovak but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Slovak."
-    missing_translations: "Until we can translate everything into Slovak, you'll see English when Slovak isn't available."
+#    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in {English} but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into {English}."
+#    missing_translations: "Until we can translate everything into {English}, you'll see English when {English} isn't available."
     learn_more: "Zisti viac, ako byť Diplomat"
     subscribe_as_diplomat: "Prihlásiť sa ako Diplomat"
 
@@ -74,7 +74,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     anonymous: "Anonymný hráč"
     level_difficulty: "Obtiažnosť."
     campaign_beginner: "Kampaň pre začiatočníkov"
-    awaiting_levels_adventurer_prefix: "Každy týždeň 5 nových levelov."
+    awaiting_levels_adventurer_prefix: "Každy týždeň 5 nových levelov." # {change}
     awaiting_levels_adventurer: "Prihlás sa ako Dobrodruh"
     awaiting_levels_adventurer_suffix: "budeš ako prvý hrať nové levely."
     adjust_volume: "Zmeniť hlasitosť"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     victory_hour_of_code_done_yes: "Áno, pre dnešok som skončil™!"
     victory_experience_gained: "Získaných XP"
     victory_gems_gained: "Získaných kryštálov"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
     victory_become_a_viking: "Staň sa vikingom!"
     guide_title: "Návod"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     feature4: "<strong>3500 bonusových diamantov</strong> každý mesiac !"
     feature5: "Video tutoriály"
     feature6: "Prémiová emailová podpora"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Zdarma"
     month: "mesiac"
     subscribe_title: "Predplatné"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     volume_label: "Halsitosť"
     music_label: "Hudba"
     music_description: "Vypnúť/zapnúť hudbu na pozadí."
-    autorun_label: "Autospustenie"
-    autorun_description: "Ovládanie automatického spustenie kódu."
     editor_config: "Konfigurácia editora"
     editor_config_title: "Konfigurácia editora"
     editor_config_level_language_label: "Jazyk pre túto úroveň"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     nick_blurb: "Motivačný Guru"
     michael_title: "Programátor"
     michael_blurb: "Systémový administrátor"
-    matt_title: "Programátor"
+    matt_title: "Programátor" # {change}
     matt_blurb: "Bicyklista"
     cat_title: "Najvyššia remeselníčka"
     cat_blurb: "Ohýbačka vzduchu"
@@ -586,8 +586,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     intro_1: "CodeCombat je online hra, ktorá učí programovať. Študenti píšu kód v skutočných programovacích jazykoch."
     intro_2: "Nie sú nutné žiadne predchádzajúce skúsenosti !"
     free_title: "Koľko to stojí ?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-    free_1: "CodeCombat Basic is ZDARMA ! K dispozícii je 70+ úrovní pokrývajúcich každý koncept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+    free_1: "CodeCombat Basic is ZDARMA ! K dispozícii je 70+ úrovní pokrývajúcich každý koncept." # {change}
     free_2: "Mesačné predplatné poskytuje prístup k videonávodom a k úrovniam na precvičenie navyše."
     teacher_subs_title: "Pre učiteľov je predplatné zdarma !"
     teacher_subs_1: "Napíšte na"
@@ -596,6 +596,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     sub_includes_1: "Študenti s mesačným predplatným získajú ku 70+ základným úrovniam  aj :" # {change}
     sub_includes_2: "40+ tréningových úrovní" # {change}
     sub_includes_3: "Video návody"
+#    sub_includes_7: "Private Clans"
     sub_includes_4: "Prémiovú emailovú podporu"
     sub_includes_5: "7 nových hrdinov s jedinečnými schopnosťami"
     sub_includes_6: "3500 bonusových diamantov každý mesiac"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     who_for_1: "CodeCombat odporúčame pre žiakov od 9 rokov. Nie sú nutné žiadne predchádzajúce skúsenosti s programovaním."
     who_for_2: "CodeCombat sme navrhli tak, aby oslovil chlapcov aj dievčatá."
     material_title: "Aký je objem učebnej látky ?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-    material_1: "Asi 8 hodín bezplatného obsahu a ďalších 14 hodín pre predplatiteľov. 5 nových úrovní každý týždeň."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+    material_1: "Asi 8 hodín bezplatného obsahu a ďalších 14 hodín pre predplatiteľov. 5 nových úrovní každý týždeň." # {change}
     concepts_title: "Aké pojmy sú pokryté ?"
     how_much_title: "Koľko stojí mesačné predplatné ?"
     how_much_1: ""

app/locale/sl.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/sr.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    anonymous: "Anonymous Player"
     level_difficulty: "Тежина: "
     campaign_beginner: "Почетничка кампања"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     victory_hour_of_code_done_yes: "Да, завршио сам свој Сат Кода!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Водич"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/sv.coffee

@@ -2,7 +2,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
   home:
     slogan: "Lär dig att koda genom att spela ett spel."
     no_ie: "CodeCombat fungerar tyvärr inte i IE8 eller äldre." # Warning that only shows up in IE8 and older
-    no_mobile: "CodeCombat är inte designat för mobila enhter och fungerar kanske inte!" # Warning that shows up on mobile devices
+    no_mobile: "CodeCombat är inte designat för mobila enheter och fungerar kanske inte!" # Warning that shows up on mobile devices
     play: "Spela" # The big play button that opens up the campaign view.
     old_browser: "Oj då, din webbläsare är för gammal för att köra CodeCombat. Förlåt!" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "Du kan försöka ändå, men det kommer nog inte fungera."
@@ -11,7 +11,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     for_beginners: "För nybörjare"
     multiplayer: "Flera spelare" # Not currently shown on home page
     for_developers: "För utvecklare" # Not currently shown on home page.
-#    or_ipad: "Or download for iPad"
+    or_ipad: "Eller ladda ner till iPad"
 
   nav:
     play: "Spela" # The top nav bar entry where players choose which levels to play
@@ -30,7 +30,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     about: "Om oss"
     contact: "Kontakt"
     twitter_follow: "Följ oss på Twitter"
-#    teachers: "Teachers"
+    teachers: "Lärare"
 
   modal:
     close: "Stäng"
@@ -42,7 +42,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
   diplomat_suggestion:
     title: "Hjälp till att översätta CodeCombat!" # This shows up when a player switches to a non-English language using the language selector.
     sub_heading: "Vi behöver dina språkliga kunskaper."
-    pitch_body: "Vi utvecklar CodeCombat på engelska, men vi har redan spelare världen över. Många av dem vill spela på svenska, men talar inte engelska, så om du talar båda språken, fundera på att registrera dig som Diplomat och hjälp till med översättningen av både hemsidan och alla nivår till svenska."
+    pitch_body: "Vi utvecklar CodeCombat på engelska, men vi har redan spelare världen över. Många av dem vill spela på svenska eftersom de inte talar engelska. Om du talar båda språken, fundera på att registrera dig som Diplomat och hjälp till med översättningen av både hemsidan och alla nivåer till svenska."
     missing_translations: "Tills vi har översatt allting till svenska, så kommer du se engelska när det inte finns någon svensk översättning tillgänglig."
     learn_more: "Läs mer om att vara en Diplomat"
     subscribe_as_diplomat: "Registrera dig som Diplomat"
@@ -61,7 +61,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     available: "Tillgänglig"
 #    skills_granted: "Skills Granted" # Property documentation details
     heroes: "Hjältar" # Tooltip on hero shop button from /play
-#    achievements: "Achievements" # Tooltip on achievement list button from /play
+    achievements: "Prestationer" # Tooltip on achievement list button from /play
     account: "Konto" # Tooltip on account button from /play
     settings: "Inställningar" # Tooltip on settings button from /play
 #    poll: "Poll" # Tooltip on poll button from /play
@@ -70,14 +70,14 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    choose_inventory: "Equip Items"
     buy_gems: "Köp ädelstenar"
 #    subscription_required: "Subscription Required"
-#    older_campaigns: "Older Campaigns"
+    older_campaigns: "Gamla kampanjer"
     anonymous: "Anonym Spelare"
     level_difficulty: "Svårighetsgrad: "
     campaign_beginner: "Nybörjarkampanj"
-    awaiting_levels_adventurer_prefix: "Vi släpper fem nya nivåer varje vecka."
-#    awaiting_levels_adventurer: "Sign up as an Adventurer"
+    awaiting_levels_adventurer_prefix: "Vi släpper nya nivåer varje vecka." # {change}
+    awaiting_levels_adventurer: "Registrera dig som äventyrare"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
-#    adjust_volume: "Adjust volume"
+    adjust_volume: "justera volymen"
     choose_your_level: "Välj din nivå" # The rest of this section is the old play view at /play-old and isn't very important.
     adventurer_prefix: "Du kan hoppa till vilken nivå som helst här under, eller diskutera nivåer på "
     adventurer_forum: "Äventyrarforumet"
@@ -93,12 +93,12 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    campaign_classic_algorithms: "Classic Algorithms"
 #    campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science."
 
-#  share_progress_modal:
+  share_progress_modal:
 #    blurb: "You’re making great progress! Tell your parent how much you've learned with CodeCombat."
-#    email_invalid: "Email address invalid."
-#    form_blurb: "Enter your parent's email below and we’ll show them!"
-#    form_label: "Email Address"
-#    placeholder: "email address"
+    email_invalid: "ogiltig e-postadress."
+    form_blurb: "Ange en förälders e-postadress så visar vi dem!"
+    form_label: "E-postadress"
+    placeholder: "e-postadress"
 #    title: "Excellent Work, Apprentice"
 
   login:
@@ -106,13 +106,13 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     log_in: "Logga in"
     logging_in: "Loggar In"
     log_out: "Logga ut"
-#    forgot_password: "Forgot your password?"
+    forgot_password: "Glömt ditt lössenord?"
 #    authenticate_gplus: "Authenticate G+"
 #    load_profile: "Load G+ Profile"
 #    finishing: "Finishing"
-#    sign_in_with_facebook: "Sign in with Facebook"
-#    sign_in_with_gplus: "Sign in with G+"
-#    signup_switch: "Want to create an account?"
+    sign_in_with_facebook: "Logga in med Facebook"
+    sign_in_with_gplus: "Logga in med G+"
+    signup_switch: "Vill du skapa ett konto?"
 
   signup:
     email_announcements: "Mottag nyheter via e-post"
@@ -120,44 +120,44 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     sign_up: "Skapa konto"
     log_in: "logga in med lösenord"
     social_signup: "Eller så kan du logga in genom facebook eller g+:"
-#    required: "You need to log in before you can go that way."
-#    login_switch: "Already have an account?"
+    required: "Du måste logga in innan du kan gå dit"
+    login_switch: "Har du redan ett konto?"
 
   recover:
     recover_account_title: "Återskapa ditt konto"
     send_password: "Skicka återskapningslösenord"
     recovery_sent: "Återskapningslösenord skickat."
 
-#  items:
-#    primary: "Primary"
-#    secondary: "Secondary"
-#    armor: "Armor"
-#    accessories: "Accessories"
-#    misc: "Misc"
-#    books: "Books"
+  items:
+    primary: "Primär"
+    secondary: "Sekundär"
+    armor: "Rustning"
+    accessories: "Tillbehör"
+    misc: "Övrigt"
+    books: "Böcker"
 
   common:
-#    back: "Back" # When used as an action verb, like "Navigate backward"
-#    continue: "Continue" # When used as an action verb, like "Continue forward"
+    back: "Tillbaka" # When used as an action verb, like "Navigate backward"
+    continue: "Fortsätt" # When used as an action verb, like "Continue forward"
     loading: "Laddar..."
     saving: "Sparar..."
     sending: "Skickar..."
     send: "Skicka"
     cancel: "Avbryt"
     save: "Spara"
-    publish: "Publisera"
+    publish: "Publicera"
     create: "Skapa"
     manual: "Manuellt"
     fork: "Förgrena"
     play: "Spela" # When used as an action verb, like "Play next level"
     retry: "Försök igen"
 #    actions: "Actions"
-#    info: "Info"
-#    help: "Help"
+    info: "Info"
+    help: "Hjälp"
 #    watch: "Watch"
 #    unwatch: "Unwatch"
 #    submit_patch: "Submit Patch"
-#    submit_changes: "Submit Changes"
+    submit_changes: "Spara Ändringar"
 
   general:
     and: "och"
@@ -173,13 +173,13 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    submitted: "Submitted"
     commit_msg: "Förbindelsemeddelande"
 #    review: "Review"
-#    version_history: "Version History"
-    version_history_for: "Versionshistorik för: "
-#    select_changes: "Select two changes below to see the difference."
-#    undo_prefix: "Undo"
-#    undo_shortcut: "(Ctrl+Z)"
-#    redo_prefix: "Redo"
-#    redo_shortcut: "(Ctrl+Shift+Z)"
+    version_history: "Ändringshistorik"
+    version_history_for: "Ändringshistorik för: "
+    select_changes: "Välj två ändringar nedan för att se skillnaden."
+    undo_prefix: "Ångra"
+    undo_shortcut: "(Ctrl+Z)"
+    redo_prefix: "gör om"
+    redo_shortcut: "(Ctrl+Shift+Z)"
 #    play_preview: "Play preview of current level"
     result: "Resultat"
     results: "Resultat"
@@ -203,9 +203,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     hard: "Svår"
     player: "Spelare"
 #    player_level: "Level" # Like player level 5, not like level: Dungeons of Kithgard
-#    warrior: "Warrior"
+    warrior: "Krigare"
 #    ranger: "Ranger"
-#    wizard: "Wizard"
+    wizard: "Trollkarl"
 
   units:
     second: "sekund"
@@ -226,162 +226,163 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
   play_level:
     done: "Klar"
     home: "Hem" # Not used any more, will be removed soon.
-#    level: "Level" # Like "Level: Dungeons of Kithgard"
-#    skip: "Skip"
+    level: "Nivå" # Like "Level: Dungeons of Kithgard"
+    skip: "Hoppa över"
     game_menu: "Spelmeny"
     guide: "Guide"
     restart: "Börja om"
     goals: "Mål"
     goal: "Mål"
-#    running: "Running..."
-#    success: "Success!"
-#    incomplete: "Incomplete"
-#    timed_out: "Ran out of time"
-#    failing: "Failing"
+    running: "Kör..."
+    success: "Du lyckades!"
+    incomplete: "Ej färdig"
+    timed_out: "Slut på tid"
+    failing: "Ingen framgång"
     action_timeline: "Händelse-tidslinje"
     click_to_select: "Klicka på en enhet för att välja den."
 #    control_bar_multiplayer: "Multiplayer"
 #    control_bar_join_game: "Join Game"
-#    reload: "Reload"
+    reload: "Ladda om"
     reload_title: "Ladda om all kod?"
     reload_really: "Är du säker på att du vill ladda om nivån från början?"
     reload_confirm: "Ladda om allt"
-#    victory: "Victory"
+    victory: "Seger"
 #    victory_title_prefix: ""
     victory_title_suffix: " Genomförd"
     victory_sign_up: "Registrera dig för att få uppdateringar"
     victory_sign_up_poke: "Vill du ha de senaste nyheterna via e-post? Skapa ett gratiskonto så håller vi dig informerad!"
     victory_rate_the_level: "Betygsätt nivån: " # Only in old-style levels.
     victory_return_to_ladder: "Gå tillbaka till stegen"
-#    victory_play_continue: "Continue"
-#    victory_saving_progress: "Saving Progress"
+    victory_play_continue: "Fortsätt"
+    victory_saving_progress: "Sparar framsteg"
     victory_go_home: "Gå hem" # Only in old-style levels.
     victory_review: "Berätta mer!" # Only in old-style levels.
     victory_hour_of_code_done: "Är du klar?"
     victory_hour_of_code_done_yes: "Ja, jag är klar med min Hour of Code!"
-#    victory_experience_gained: "XP Gained"
-#    victory_gems_gained: "Gems Gained"
-#    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
-#    victory_become_a_viking: "Become a Viking"
+    victory_experience_gained: "XP mottaget"
+    victory_gems_gained: "Vunna ädelstenar"
+    victory_new_item: "Nytt föremål"
+    victory_viking_code_school: "Jösses vilken svår nivå du just klarade! Om du inte redan är en mjukvaruutvecklare så borde du vara det. Du bev precis fast-tracked för antagning vid Viking Code School, där du kan ta dina kunskaper till en ny nivå och bli en professionell webbutvecklare på 14 veckor."
+    victory_become_a_viking: "Bli en Viking"
     guide_title: "Guide"
     tome_minion_spells: "Dina soldaters förmågor" # Only in old-style levels.
     tome_read_only_spells: "Skrivskyddade förmågor" # Only in old-style levels.
     tome_other_units: "Andra enheter" # Only in old-style levels.
-#    tome_cast_button_run: "Run"
-#    tome_cast_button_running: "Running"
-#    tome_cast_button_ran: "Ran"
-#    tome_submit_button: "Submit"
-#    tome_reload_method: "Reload original code for this method" # Title text for individual method reload button.
-#    tome_select_method: "Select a Method"
-#    tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methdos).
+    tome_cast_button_run: "Kör"
+    tome_cast_button_running: "Kör..."
+    tome_cast_button_ran: "Körde"
+    tome_submit_button: "Lämna in"
+    tome_reload_method: "Ladda om den ursprungliga koden för den här metoden" # Title text for individual method reload button.
+    tome_select_method: "Välj en metod"
+    tome_see_all_methods: "Se alla metoder som du kan editera" # Title text for method list selector (shown when there are multiple programmable methdos).
     tome_select_a_thang: "Välj någon för "
     tome_available_spells: "Tillgängliga förmågor"
-#    tome_your_skills: "Your Skills"
-#    tome_help: "Help"
-#    tome_current_method: "Current Method"
-#    hud_continue_short: "Continue"
-#    code_saved: "Code Saved"
+    tome_your_skills: "Dina färdigheter"
+    tome_help: "Hjälp"
+    tome_current_method: "Nuvarande metod"
+    hud_continue_short: "Fortsätt"
+    code_saved: "Kod sparad"
     skip_tutorial: "Hoppa över (esc)"
-#    keyboard_shortcuts: "Key Shortcuts"
-#    loading_ready: "Ready!"
-#    loading_start: "Start Level"
-#    problem_alert_title: "Fix Your Code"
-#    problem_alert_help: "Help"
-#    time_current: "Now:"
-#    time_total: "Max:"
-#    time_goto: "Go to:"
-#    infinite_loop_try_again: "Try Again"
-#    infinite_loop_reset_level: "Reset Level"
+    keyboard_shortcuts: "Kortkommandon"
+    loading_ready: "Redo!"
+    loading_start: "Starta Nivå"
+    problem_alert_title: "Fixa din kod"
+    problem_alert_help: "Hjälp"
+    time_current: "Nu:"
+    time_total: "Max:"
+    time_goto: "Gå till:"
+    infinite_loop_try_again: "Försök igen"
+    infinite_loop_reset_level: "Återställ Nivå"
 #    infinite_loop_comment_out: "Comment Out My Code"
-#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
-#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
+    tip_toggle_play: "Spela/pausa med Ctrl+P."
+    tip_scrub_shortcut: "Ctrl+] och Ctrl+[ spolar framåt och bakåt."
 #    tip_guide_exists: "Click the guide, inside game menu (at the top of the page), for useful info."
-#    tip_open_source: "CodeCombat is 100% open source!"
-#    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
-#    tip_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_open_source: "CodeCombat är 100% öppen källkod!"
+    tip_beta_launch: "CodeCombat startade sin beta i oktober 2013."
+    tip_think_solution: "Tänk på lösningen, inte problemet."
+    tip_theory_practice: "Teoretiskt sett så är det ingen skillnad mellan teori och praktik. Men i praktiken så är det. - Yogi Berra"
+    tip_error_free: "Det finns två sätt att skriva felfria program; endast det tredje fungerar. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
 #    tip_forums: "Head over to the forums and tell us what you think!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
+    tip_baby_coders: "I framtiden är till och med bebisar ärkemagiker."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
-#    tip_harry: "Yer a Wizard, "
+    tip_harry: "Du e' en trollkarl, "
 #    tip_great_responsibility: "With great coding skill comes great debug responsibility."
 #    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
-#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
+    tip_binary: "Det finns 10 sorters människor på jorden, de som försår binära tal och de som inte gör det."
 #    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
-#    tip_talk_is_cheap: "Talk is cheap. Show me the code. - Linus Torvalds"
+    tip_no_try: "Gör. Eller gör inte. Försök finns inte. - Yoda"
+    tip_patience: "Tålamod du måste ha, unge Padawan. - Yoda"
+    tip_documented_bug: "En dokumenterad bugg är inte en bugg - det är en funktion."
+    tip_impossible: "Allt verkar alltid omöjligt ända tills någon gör det. - Nelson Mandela"
+    tip_talk_is_cheap: "Det är billigt att prata. Visa mig koden. - Linus Torvalds"
 #    tip_first_language: "The most disastrous thing that you can ever learn is your first programming language. - Alan Kay"
-#    tip_hardware_problem: "Q: How many programmers does it take to change a light bulb?  A: None, it's a hardware problem."
+    tip_hardware_problem: "Fråga: Hur många programmerare krävs för att byta en glödlampa?  Svar: Inga, det är ett hårdvaruproblem."
 #    tip_hofstadters_law: "Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law."
 #    tip_premature_optimization: "Premature optimization is the root of all evil. - Donald Knuth"
 #    tip_brute_force: "When in doubt, use brute force. - Ken Thompson"
 #    tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..."
 #    tip_superpower: "Coding is the closest thing we have to a superpower."
 #    tip_control_destiny: "In real open source, you have the right to control your own destiny. - Linus Torvalds"
-#    tip_no_code: "No code is faster than no code."
-#    tip_code_never_lies: "Code never lies, comments sometimes do. — Ron Jeffries"
+    tip_no_code: "Inge kod är snabbare än ingen kod."
+    tip_code_never_lies: "Kod ljuger aldrig, kommentarer gör det ibland. — Ron Jeffries"
 #    tip_reusable_software: "Before software can be reusable it first has to be usable."
 #    tip_optimization_operator: "Every language has an optimization operator. In most languages that operator is ‘//’"
 #    tip_lines_of_code: "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. — Bill Gates"
 #    tip_source_code: "I want to change the world but they would not give me the source code."
 #    tip_javascript_java: "Java is to JavaScript what Car is to Carpet. - Chris Heilmann"
-#    tip_move_forward: "Whatever you do, keep moving forward. - Martin Luther King Jr."
-#    tip_google: "Have a problem you can't solve? Google it!"
-#    tip_adding_evil: "Adding a pinch of evil."
-#    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-#    tip_open_source_contribute: "You can help CodeCombat improve!"
-#    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
+    tip_move_forward: "Vad du än gör, fortsätt framåt. - Martin Luther King Jr."
+    tip_google: "Ett problem du inte kan lösa? Googla det!"
+    tip_adding_evil: "Också en nypa ondska."
+    tip_hate_computers: "Det är det som är grejen med folk som tror att de hatar datorer. Det de egentligen hatar är dåliga programmerare. - Larry Niven"
+    tip_open_source_contribute: "Du kan få CodeCombat att bli ännu bättre!"
+    tip_recurse: "Iteration är mänskligt, rekursion är gudomligt. - L. Peter Deutsch"
 
   game_menu:
     inventory_tab: "Utrustning"
     save_load_tab: "Spara/Ladda"
     options_tab: "Inställningar"
     guide_tab: "Guide"
-#    guide_video_tutorial: "Video Tutorial"
-#    guide_tips: "Tips"
-    multiplayer_tab: "Flerspelareläge"
+    guide_video_tutorial: "Videogenomgång"
+    guide_tips: "Tips"
+    multiplayer_tab: "Flerspelarläge"
     auth_tab: "Registrera dig"
     inventory_caption: "Utrusta din hjälte"
-#    choose_hero_caption: "Choose hero, language"
-#    save_load_caption: "... and view history"
+    choose_hero_caption: "Välj hjälte, språk"
+    save_load_caption: "... och visa historik"
 #    options_caption: "Configure settings"
 #    guide_caption: "Docs and tips"
-#    multiplayer_caption: "Play with friends!"
-#    auth_caption: "Save your progress."
+    multiplayer_caption: "Spela med vänner!"
+    auth_caption: "Spara dina framsteg."
 
-#  leaderboard:
-#    leaderboard: "Leaderboard"
-#    view_other_solutions: "View Leaderboards"
-#    scores: "Scores"
-#    top_players: "Top Players by"
-#    day: "Today"
-#    week: "This Week"
-#    all: "All-Time"
-#    time: "Time"
-#    damage_taken: "Damage Taken"
-#    damage_dealt: "Damage Dealt"
-#    difficulty: "Difficulty"
-#    gold_collected: "Gold Collected"
+  leaderboard:
+    leaderboard: "Topplista"
+    view_other_solutions: "Visa topplistor"
+    scores: "Poäng"
+    top_players: "Toppspelare efter"
+    day: "Idag"
+    week: "Den här veckan"
+    all: "Alla"
+    time: "Tid"
+    damage_taken: "Skada mottagen"
+    damage_dealt: "Skada utdelad"
+    difficulty: "Svårighetsgrad"
+    gold_collected: "Samlat guld"
 
-#  inventory:
-#    choose_inventory: "Equip Items"
-#    equipped_item: "Equipped"
-#    required_purchase_title: "Required"
-#    available_item: "Available"
-#    restricted_title: "Restricted"
-#    should_equip: "(double-click to equip)"
-#    equipped: "(equipped)"
-#    locked: "(locked)"
-#    restricted: "(restricted in this level)"
-#    equip: "Equip"
-#    unequip: "Unequip"
+  inventory:
+    choose_inventory: "Använd föremål"
+    equipped_item: "Används"
+    required_purchase_title: "Krävs"
+    available_item: "Tillgänglig"
+    restricted_title: "Begränsad"
+    should_equip: "(dubbeklicka för att använda)"
+    equipped: "(används)"
+    locked: "(låst)"
+    restricted: "(begränsad på den här nivån)"
+    equip: "Använd"
+    unequip: "Ta av"
 
 #  buy_gems:
 #    few_gems: "A few gems"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -463,76 +465,74 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    subscribe_prepaid: "Click Subscribe to use prepaid code"
 #    using_prepaid: "Using prepaid code for monthly subscription"
 
-#  choose_hero:
-#    choose_hero: "Choose Your Hero"
-#    programming_language: "Programming Language"
-#    programming_language_description: "Which programming language do you want to use?"
-#    default: "Default"
-#    experimental: "Experimental"
-#    python_blurb: "Simple yet powerful, great for beginners and experts."
-#    javascript_blurb: "The language of the web. (Not the same as Java.)"
-#    coffeescript_blurb: "Nicer JavaScript syntax."
-#    clojure_blurb: "A modern Lisp."
-#    lua_blurb: "Game scripting language."
-#    io_blurb: "Simple but obscure."
-#    status: "Status"
-#    hero_type: "Type"
-#    weapons: "Weapons"
-#    weapons_warrior: "Swords - Short Range, No Magic"
-#    weapons_ranger: "Crossbows, Guns - Long Range, No Magic"
-#    weapons_wizard: "Wands, Staffs - Long Range, Magic"
-#    attack: "Damage" # Can also translate as "Attack"
-#    health: "Health"
-#    speed: "Speed"
-#    regeneration: "Regeneration"
-#    range: "Range" # As in "attack or visual range"
-#    blocks: "Blocks" # As in "this shield blocks this much damage"
+  choose_hero:
+    choose_hero: "Välj hjälte"
+    programming_language: "Programspråk"
+    programming_language_description: "Vilket programspråk vill du använda?"
+    default: "Standard"
+    experimental: "Experimentell"
+    python_blurb: "Enkelt men ändå kraftfullt, perfekt för nybörjare och experter."
+    javascript_blurb: "Webbens språk. (Inte samma sak som Java.)"
+    coffeescript_blurb: "Trevligare JavaScript-syntax."
+    clojure_blurb: "Ett modernt Lisp."
+    lua_blurb: "Språk för spelskript."
+    io_blurb: "Enkelt men obskyrt."
+    status: "Status"
+    hero_type: "Typ"
+    weapons: "Vapen"
+    weapons_warrior: "Svärd - Kort räckvidd, ingen magi"
+    weapons_ranger: "Armborst, pistoler - Lång räckvidd, ingen magi"
+    weapons_wizard: "Trollspön, stavar - Lång räckvidd, magi"
+    attack: "Attack" # Can also translate as "Attack"
+    health: "Hälsa"
+    speed: "Hastighet"
+    regeneration: "Regeneration"
+    range: "Räckvidd" # As in "attack or visual range"
+    blocks: "Blockerar" # As in "this shield blocks this much damage"
 #    backstab: "Backstab" # As in "this dagger does this much backstab damage"
-#    skills: "Skills"
-#    attack_1: "Deals"
-#    attack_2: "of listed"
-#    attack_3: "weapon damage."
-#    health_1: "Gains"
-#    health_2: "of listed"
-#    health_3: "armor health."
-#    speed_1: "Moves at"
-#    speed_2: "meters per second."
-#    available_for_purchase: "Available for Purchase" # Shows up when you have unlocked, but not purchased, a hero in the hero store
-#    level_to_unlock: "Level to unlock:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
-#    restricted_to_certain_heroes: "Only certain heroes can play this level."
+    skills: "Färdigheter"
+    attack_1: "Gör"
+    attack_2: "av noterad vapenskada för"
+    attack_3: "."
+    health_1: "Får"
+    health_2: "av noterad rustningshälsa för"
+    health_3: "."
+    speed_1: "Rör sig"
+    speed_2: "meter per sekund."
+    available_for_purchase: "Tillgänlig att köpa" # Shows up when you have unlocked, but not purchased, a hero in the hero store
+    level_to_unlock: "Nivå som låser upp:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
+    restricted_to_certain_heroes: "Det är bara vissa hjältar som kan spela den här nivån."
 
-#  skill_docs:
-#    writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this
-#    read_only: "read-only"
-#    action_name: "name"
-#    action_cooldown: "Takes"
-#    action_specific_cooldown: "Cooldown"
-#    action_damage: "Damage"
-#    action_range: "Range"
-#    action_radius: "Radius"
-#    action_duration: "Duration"
-#    example: "Example"
-#    ex: "ex" # Abbreviation of "example"
-#    current_value: "Current Value"
-#    default_value: "Default value"
-#    parameters: "Parameters"
-#    returns: "Returns"
-#    granted_by: "Granted by"
+  skill_docs:
+    writable: "skrivbar" # Hover over "attack" in Your Skills while playing a level to see most of this
+    read_only: "endast läsning"
+    action_name: "namn"
+    action_cooldown: "Tar"
+    action_specific_cooldown: "Återhämtningstid"
+    action_damage: "Skada"
+    action_range: "Räckvidd"
+    action_radius: "Radie"
+    action_duration: "Löptid"
+    example: "Exampel"
+    ex: "ex" # Abbreviation of "example"
+    current_value: "Nuvarande värde"
+    default_value: "Standardvärde"
+    parameters: "Parametrar"
+    returns: "Returnerar"
+    granted_by: "Ges av"
 
 #  save_load:
 #    granularity_saved_games: "Saved"
 #    granularity_change_history: "History"
 
   options:
-#    general_options: "General Options" # Check out the Options tab in the Game Menu while playing a level
-#    volume_label: "Volume"
-#    music_label: "Music"
-#    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
+    general_options: "Allmänna inställningar" # Check out the Options tab in the Game Menu while playing a level
+    volume_label: "Volym"
+    music_label: "Musik"
+    music_description: "Stäng av/sätt på bakgrundsmusik."
     editor_config: "Ställ in redigerare"
     editor_config_title: "Redigerarinställningar"
-#    editor_config_level_language_label: "Language for This Level"
+    editor_config_level_language_label: "Språk på den här nivån"
 #    editor_config_level_language_description: "Define the programming language for this particular level."
 #    editor_config_default_language_label: "Default Programming Language"
 #    editor_config_default_language_description: "Define the programming language you want to code in when starting new levels."
@@ -542,7 +542,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    editor_config_livecompletion_label: "Live Autocompletion"
 #    editor_config_livecompletion_description: "Displays autocomplete suggestions while typing."
     editor_config_invisibles_label: "Visa osynliga"
-    editor_config_invisibles_description: "Visar osynliga tecken såsom mellanrum och nyradstecken."
+    editor_config_invisibles_description: "Visar osynliga tecken, till exempel mellanrum och nyradstecken."
     editor_config_indentguides_label: "Visa indenteringsguider"
     editor_config_indentguides_description: "Visar vertikala linjer för att kunna se indentering bättre."
     editor_config_behaviors_label: "Smart beteende"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"
@@ -630,8 +631,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     forum_prefix: "För någonting offentligt, var vänlig testa "
     forum_page: "vårt forum"
     forum_suffix: " istället."
-#    faq_prefix: "There's also a"
-#    faq: "FAQ"
+    faq_prefix: "Det finns också en"
+    faq: "FAQ"
 #    subscribe_prefix: "If you need help figuring out a level, please"
 #    subscribe: "buy a CodeCombat subscription"
 #    subscribe_suffix: "and we'll be happy to help you with your code."
@@ -648,28 +649,28 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     autosave: "Ändringar sparas automatiskt"
     me_tab: "Jag"
     picture_tab: "Profilbild"
-#    delete_account_tab: "Delete Your Account"
-#    wrong_email: "Wrong Email"
-#    upload_picture: "Upload a picture"
-#    delete_this_account: "Delete this account permanently"
+    delete_account_tab: "Ta bort ditt konto"
+    wrong_email: "Fel e-post"
+    upload_picture: "Ladda upp en bild"
+    delete_this_account: "Ta bort det här kontot för alltid"
 #    god_mode: "God Mode"
     password_tab: "Lösenord"
     emails_tab: "E-postadresser"
     admin: "Administratör"
     new_password: "Nytt lösenord"
     new_password_verify: "Verifiera"
-#    type_in_email: "Type in your email to confirm the deletion"
+    type_in_email: "Skriv in din e-post för att bekräfta borttagandet"
     email_subscriptions: "E-postsprenumerationer"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Meddelanden"
     email_announcements_description: "Få e-post med de senaste nyheterna och utvecklingen på CodeCombat."
-    email_notifications: "Påminnelser"
-#    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
-#    email_any_notes: "Any Notifications"
-#    email_any_notes_description: "Disable to stop all activity notification emails."
-#    email_news: "News"
-#    email_recruit_notes: "Job Opportunities"
-#    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
+    email_notifications: "Underrättelser"
+    email_notifications_summary: "Kontroller för personliga, automatiska e-postunderrättelser relaterade till din aktivitet på CodeCombat."
+    email_any_notes: "Alla underrättelser"
+    email_any_notes_description: "Stäng av för att hindra all e-post om aktiviteter."
+    email_news: "Nyheter"
+    email_recruit_notes: "Jobbtillfällen"
+    email_recruit_notes_description: "Om du spelar riktigt bra så kanske vi kontaktar dig för att erbjuda ett (bättre) jobb."
     contributor_emails: "E-post för bidragare"
     contribute_prefix: "Vi söker mer folk som vill var med och hjälpa till! Kolla in "
     contribute_page: " bidragarsidan "
@@ -678,24 +679,24 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     error_saving: "Ett fel uppstod när ändringarna skulle sparas"
     saved: "Ändringar sparade"
     password_mismatch: "De angivna lösenorden stämmer inte överens."
-#    password_repeat: "Please repeat your password."
+    password_repeat: "Var god skriv ditt lösenord en gång till."
 #    job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
 #    sample_profile: "See a sample profile"
 #    view_profile: "View Your Profile"
 
-#  keyboard_shortcuts:
-#    keyboard_shortcuts: "Keyboard Shortcuts"
-#    space: "Space"
-#    enter: "Enter"
-#    escape: "Escape"
-#    shift: "Shift"
-#    run_code: "Run current code."
-#    run_real_time: "Run in real time."
-#    continue_script: "Continue past current script."
-#    skip_scripts: "Skip past all skippable scripts."
-#    toggle_playback: "Toggle play/pause."
+  keyboard_shortcuts:
+    keyboard_shortcuts: "Kortkommandon"
+    space: "Mellanslag"
+    enter: "Enter"
+    escape: "Escape"
+    shift: "Shift"
+    run_code: "Kör nuvarande kod."
+    run_real_time: "Kör i realtid."
+    continue_script: "Fortsätt förbi nuvarande skript."
+    skip_scripts: "Hoppa över alla skript som kan hoppas över."
+    toggle_playback: "Spela/Pausa."
 #    scrub_playback: "Scrub back and forward through time."
 #    single_scrub_playback: "Scrub back and forward through time by a single frame."
 #    scrub_execution: "Scrub through current spell execution."
@@ -703,7 +704,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    toggle_grid: "Toggle grid overlay."
 #    toggle_pathfinding: "Toggle pathfinding overlay."
 #    beautify: "Beautify your code by standardizing its formatting."
-#    maximize_editor: "Maximize/minimize code editor."
+    maximize_editor: "Maximera/minimera kodredigeraren."
 
 #  community:
 #    main_title: "CodeCombat Community"
@@ -724,7 +725,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    contribute_to_the_project: "Contribute to the project"
 
   classes:
-    archmage_title: "Huvudmagiker"
+    archmage_title: "Ärkemagiker"
     archmage_title_description: "(Kodare)"
 #    archmage_summary: "If you are a developer interested in coding educational games, become an archmage to help us build CodeCombat!"
     artisan_title: "Hantverkare"
@@ -763,7 +764,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
 #    generate_terrain: "Generate Terrain"
-#    more: "More"
+    more: "Mer"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
 #    thang_main: "Main"
@@ -830,8 +831,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     edit_btn_preview: "Förhandsgranska"
     edit_article_title: "Redigera artikel"
 
-#  polls:
-#    priority: "Priority"
+  polls:
+    priority: "Prioritet"
 
   contribute:
     page_title: "Bidragande"
@@ -845,7 +846,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     archmage_attribute_2: "Viss erfarenhet av programmering och personligt initiativ. Vi hjälper dig att bli orienterad, men kan inte lägga mycket tid på att träna dig."
     how_to_join: "Hur man går med"
     join_desc_1: "Alla kan hjälpa till! Kolla bara in vår "
-    join_desc_2: "för att komma igång, och kryssa i rutan nedanför för att markera att du är en modig huvudmagiker och få de senaste nyheterna via email. Vill du chatta om vad som ska göras eller hur du bli mer involverad?"
+    join_desc_2: "för att komma igång, och kryssa i rutan nedanför för att markera att du är en modig ärkemagiker och få de senaste nyheterna via email. Vill du chatta om vad som ska göras eller hur du bli mer involverad?"
     join_desc_3: ", eller hitta oss i vår "
     join_desc_4: "så tar vi det därifrån!"
     join_url_email: "Maila oss"
@@ -880,9 +881,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     diplomat_launch_url: "lanseringen i oktober"
     diplomat_introduction_suf: "är det att det finns ett stort intresse för CodeCombat i andra länder! Vi bygger en kår av översättare ivriga att förvandla en samling ord till en annan samling ord för att få CodeCombat så tillgänglig i världen som möjligt. Om du gillar att få tjuvkikar på kommande innehåll och att få dessa nivåer till de andra i ditt land så snart som möjligt är det här kanske klassen för dig."
     diplomat_attribute_1: "Flytande engelska och språket du vill översätta till. När man förmedlar komplicerade idéer är det viktigt att ha ett starkt grepp om båda!"
-#    diplomat_i18n_page_prefix: "You can start translating our levels by going to our"
-#    diplomat_i18n_page: "translations page"
-#    diplomat_i18n_page_suffix: ", or our interface and website on GitHub."
+    diplomat_i18n_page_prefix: "Du kan börja översätta nivåer genom att gå till vår"
+    diplomat_i18n_page: "översättningssida"
+    diplomat_i18n_page_suffix: ", eller använda vårt gränssnitt och hemsida på GitHub."
     diplomat_join_pref_github: "Hitta ditt språks locale-fil "
     diplomat_github_url: "på GitHub"
     diplomat_join_suf_github: ", redigera den online, och skicka en ryckförfrågan. Kryssa också i rutan här nedanför för att hålla dig uppdaterad om nya internationaliseringsutvecklingar."
@@ -895,7 +896,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     ambassador_subscribe_desc: "Få mail om supportuppdateringar och flerspelarutvecklingar"
     changes_auto_save: "Förändringar sparas automatiskt när du ändrar kryssrutor."
     diligent_scribes: "Våra flitiga skriftlärda:"
-    powerful_archmages: "Våra kraftfulla huvudmagiker:"
+    powerful_archmages: "Våra kraftfulla ärkemagiker:"
     creative_artisans: "Våra kreativa hantverkare:"
     brave_adventurers: "Våra modiga äventyrare:"
     translating_diplomats: "Våra översättande diplomater:"
@@ -908,11 +909,11 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     simulation_explanation: "Genom att simulera matcher kan du få dina matcher rankade fortare."
     simulate_games: "Simulera matcher!"
     simulate_all: "ÅTERSTÄLL OCH SIMULERA MATCHER"
-#    games_simulated_by: "Games simulated by you:"
-#    games_simulated_for: "Games simulated for you:"
-#    games_simulated: "Games simulated"
-#    games_played: "Games played"
-#    ratio: "Ratio"
+    games_simulated_by: "Spel simulerade av dig:"
+    games_simulated_for: "Spel simulerade åt dig:"
+    games_simulated: "Simulerade spel"
+    games_played: "Spelade spel"
+    ratio: "Förhållande"
     leaderboard: "Resultattavla"
     battle_as: "Kämpa som "
     summary_your: "Dina "
@@ -926,12 +927,12 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     rank_failed: "Kunde inte ranka"
     rank_being_ranked: "Matchen blir rankad"
 #    rank_last_submitted: "submitted "
-#    help_simulate: "Help simulate games?"
+    help_simulate: "Hjälp till att simulera spel?"
     code_being_simulated: "Din nya kod håller på att bli simulerad av andra spelare för rankning. Detta kommer att uppdateras allt eftersom nya matcher kommer in."
     no_ranked_matches_pre: "Inga rankade matcher för "
     no_ranked_matches_post: " laget! Spela mot några motståndare och kom sedan tillbaka it för att få din match rankad."
     choose_opponent: "Välj en motståndare"
-#    select_your_language: "Select your language!"
+    select_your_language: "Välj språk!"
     tutorial_play: "Spela tutorial"
     tutorial_recommended: "Rekommenderas om du aldrig har spelat tidigare"
     tutorial_skip: "Hoppa över tutorial"
@@ -954,34 +955,34 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    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_zero_sum: "Unleash your coding creativity in both gold gathering and battle tactics in this alpine mirror match between red sorcerer and blue sorcerer. The tournament began on Friday, March 27 and will run until Monday, April 6 at 5PM PDT. Compete for fun and glory! Check out the details"
 #    tournament_blurb_blog: "on our blog"
-#    rules: "Rules"
-#    winners: "Winners"
+    rules: "Regler"
+    winners: "Vinnare"
 
-#  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 "
+  user:
+    stats: "Stats"
+    singleplayer_title: "Enspelarnivåer"
+    multiplayer_title: "Flerspelarnivåer"
+    achievements_title: "Prestationer"
+    last_played: "Senast spelad"
+    status: "Status"
+    status_completed: "Avklarad"
+    status_unfinished: "Ej avklarad"
+    no_singleplayer: "Inga spel i enkelspelarläge än."
+    no_multiplayer: "Inga spel i flerspelarläge än."
+    no_achievements: "Inga prestationer än."
+    favorite_prefix: "Favoritspråk: "
 #    favorite_postfix: "."
 
-#  achievements:
-#    last_earned: "Last Earned"
-#    amount_achieved: "Amount"
-#    achievement: "Achievement"
+  achievements:
+    last_earned: "Senast förvärvad den"
+    amount_achieved: "Antal"
+    achievement: "Prestation"
 #    category_contributor: "Contributor"
 #    category_ladder: "Ladder"
-#    category_level: "Level"
-#    category_miscellaneous: "Miscellaneous"
-#    category_levels: "Levels"
-#    category_undefined: "Uncategorized"
+    category_level: "Nivå"
+    category_miscellaneous: "Övrigt"
+    category_levels: "Nivåer"
+    category_undefined: "Okategoriserad"
 #    current_xp_prefix: ""
 #    current_xp_postfix: " in total"
 #    new_xp_prefix: ""
@@ -990,26 +991,26 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    left_xp_infix: " until level "
 #    left_xp_postfix: ""
 
-#  account:
-#    recently_played: "Recently Played"
-#    no_recent_games: "No games played during the past two weeks."
-#    payments: "Payments"
+  account:
+    recently_played: "Spelade nyligen"
+    no_recent_games: "Inga spel spelade de senaste två veckorna."
+    payments: "Betalningar"
 #    purchased: "Purchased"
-#    subscription: "Subscription"
-#    invoices: "Invoices"
+    subscription: "Prenumeration"
+    invoices: "Fakturor"
 #    service_apple: "Apple"
-#    service_web: "Web"
-#    paid_on: "Paid On"
+    service_web: "Webb"
+    paid_on: "Betalat den"
 #    service: "Service"
-#    price: "Price"
-#    gems: "Gems"
-#    active: "Active"
+    price: "Pris"
+    gems: "Ädelstenar"
+    active: "Aktiv"
 #    subscribed: "Subscribed"
 #    unsubscribed: "Unsubscribed"
 #    active_until: "Active Until"
-#    cost: "Cost"
-#    next_payment: "Next Payment"
-#    card: "Card"
+    cost: "Kostnad"
+    next_payment: "Nästa betalning"
+    card: "Kort"
 #    status_unsubscribed_active: "You're not subscribed and won't be billed, but your account is still active for now."
 #    status_unsubscribed: "Get access to new levels, heroes, items, and bonus gems with a CodeCombat subscription!"
 
@@ -1086,14 +1087,14 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    poll: "Poll"
 #    user_polls_record: "Poll Voting History"
 
-#  delta:
+  delta:
 #    added: "Added"
 #    modified: "Modified"
 #    deleted: "Deleted"
 #    moved_index: "Moved Index"
 #    text_diff: "Text Diff"
 #    merge_conflict_with: "MERGE CONFLICT WITH"
-#    no_changes: "No Changes"
+    no_changes: "Inga ändringar"
 
 #  guide:
 #    temp: "Temp"
@@ -1114,7 +1115,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     opensource_description_prefix: "Spana in "
     github_url: "vår GitHub"
     opensource_description_center: " och hjälp till om du vill! CodeCombat är byggt på dussintals projekt med öppen källkod, och vi älskar dem. Se "
-    archmage_wiki_url: "vår Huvudmagiker-wiki"
+    archmage_wiki_url: "vår Ärkemagiker-wiki"
     opensource_description_suffix: "för en lista över mjukvaran som gör detta spel möjligt."
     practices_title: "Respektfulla \"best practices\""
     practices_description: "Dessa är våra löften till dig, spelaren, på lite mindre juristspråk."

app/locale/th.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/tr.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     anonymous: "Anonim Oyuncu"
     level_difficulty: "Zorluk: "
     campaign_beginner: "Acemi Seferi"
-    awaiting_levels_adventurer_prefix: "Haftada beş bölüm yayınlıyoruz."
+    awaiting_levels_adventurer_prefix: "Haftada beş bölüm yayınlıyoruz." # {change}
     awaiting_levels_adventurer: "Yeni oyunları ilk oynayan olmak için"
     awaiting_levels_adventurer_suffix: "Maceracı olarak kayıt ol."
     adjust_volume: "Sesi ayarla"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     victory_hour_of_code_done_yes: "Evet, Kod Saatimi (Hour of Code) bitirdim!"
     victory_experience_gained: "Kazanılan XP"
     victory_gems_gained: "Kazanılan Taş"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Rehber"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     volume_label: "Ses"
     music_label: "Müzik"
     music_description: "Arkaplan müziğini aç/kapat."
-    autorun_label: "Otomatik çalıştır"
-    autorun_description: "Otomatik kod çalıştırmayı denetle."
     editor_config: "Düzenleyici Yapılandırması"
     editor_config_title: "Düzenleyici Yapılandırması"
     editor_config_level_language_label: "Bu Bölümün Dili"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    nick_blurb: "Motivation Guru"
     michael_title: "Programcı"
 #    michael_blurb: "Sys Admin"
-    matt_title: "Programcı"
+    matt_title: "Programcı" # {change}
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/uk.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     anonymous: "Гравець-анонім"
     level_difficulty: "Складність: "
     campaign_beginner: "Кампанія для початківців"
-    awaiting_levels_adventurer_prefix: "Ми випускаємо 5 рівнів на тиждень."
+    awaiting_levels_adventurer_prefix: "Ми випускаємо 5 рівнів на тиждень." # {change}
     awaiting_levels_adventurer: "Увійди як Шукач пригод"
     awaiting_levels_adventurer_suffix: "стань одним з перших, хто їх спробує."
     adjust_volume: "Підлаштувати гучність"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     victory_hour_of_code_done_yes: "Так, я закінчив Годину Коду!"
     victory_experience_gained: "Отриманий досвід"
     victory_gems_gained: "Отримані самоцвіти"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Посібник"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     feature4: "<strong>3500 бонусних самоцвітів</strong> кожного місяця!"
     feature5: "Навчальні відеоролики"
     feature6: "Екслюзивна підтримка по електронній пошті"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Безкоштовно"
     month: "місяць"
     subscribe_title: "Взяти абонемент"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     parent_email_title: "Яка в твоїх батьків електронна адреса?"
     parents: "Батькам"
     parents_title: "Ваша дитина вчитиметься програмувати." # {change}
-    parents_blurb1: "Разом з CodeCombat Ваша дитина писатиме реальний код. Почне з простих команд та поступово буде розвиватись до складніших тем." # {change}
+    parents_blurb1: "Разом з CodeCombat Ваша дитина писатиме реальний код. Почне з простих команд та поступово буде розвиватись до складніших тем."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "За 9.99$ на місяць, вона отримуватиме нові завдання щотижня та персональні листи підтримки від професійних програмістів." # {change}
     parents_blurb3: "Жодного ризику: 100% гарантія повернення грошей, легке скасування абонементу одним кліком."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Українська", englishDescription:
     volume_label: "Гучність"
     music_label: "Музика"
     music_description: "Увімкнення та вимкнення фонової музики."
-    autorun_label: "Автовиконання"
-    autorun_description: "Контролює автоматичне виконання коду."
     editor_config: "Редактор налашт."
     editor_config_title: "Редактор налаштувань"
     editor_config_level_language_label: "Мова цього рівня"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     nick_blurb: "Ґуру мотивації"
     michael_title: "Програміст"
     michael_blurb: "Сисадмін"
-    matt_title: "Програміст"
+    matt_title: "Програміст" # {change}
     matt_blurb: "Велосипедист"
     cat_title: "Головний ремісник"
     cat_blurb: "Маг повітря"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/ur.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/vi.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     anonymous: "Người chơi vô danh"
     level_difficulty: "Khó: "
     campaign_beginner: "Chiến dịch chế độ đơn giản"
-    awaiting_levels_adventurer_prefix: "Chúng tôi cho ra 5 bàn mới mỗi tuần."
+    awaiting_levels_adventurer_prefix: "Chúng tôi cho ra 5 bàn mới mỗi tuần." # {change}
     awaiting_levels_adventurer: "Đăng kí với tư cách là nhà thám hiểm"
     awaiting_levels_adventurer_suffix: "để trở thành những người đầu tiên chơi những bàn mới."
     adjust_volume: "Tùy chỉnh âm lượng"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     victory_hour_of_code_done_yes: "Đúng vậy, tôi đã hoàn tất thời gian lập trình!"
     victory_experience_gained: "XP nhận được"
     victory_gems_gained: "Ngọc nhận được"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "Hướng dẫn"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
     feature2: "7 <strong>nhât vật mới</strong> mạnh mẽ với những kĩ năng đặc biệt!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
     feature4: "<strong>Được thưởng thêm 3500 ngọc</strong> mỗi tháng!"
     feature5: "Những video hướng dẫn qua bàn"
     feature6: "Sự hỗ trợ tận tình qua email"
+#    feature7: "Private <strong>Clans</strong>"
     free: "Miễn phí"
     month: "tháng"
 #    subscribe_title: "Subscribe"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     parent_email_title: "Địa chỉ email của bố hoặc mẹ bạn là gì ?"
     parents: "Dành cho cha mẹ"
     parents_title: "Con của bạn sẽ học cách viết code (lập trình)." # {change}
-    parents_blurb1: "Với CodeCombat, con của bạn sẽ có thể học lập trình bằng việc viết những dòng code thật sự. Con bạn sẽ bắt đầu bằng việc học những lệnh cơ bản, và sau đó sẽ từ từ tìm hiểu về các vấn đề phức tạp hơn." # {change}
+    parents_blurb1: "Với CodeCombat, con của bạn sẽ có thể học lập trình bằng việc viết những dòng code thật sự. Con bạn sẽ bắt đầu bằng việc học những lệnh cơ bản, và sau đó sẽ từ từ tìm hiểu về các vấn đề phức tạp hơn."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "Chỉ với $9.99 USD một tháng, con của bạn sẽ nhận được những thử thách mới mỗi tháng và sẽ nhận được sự hỗ trợ từ các lập trình viên chuyên nghiệp qua email." # {change}
     parents_blurb3: "Không hề có rủi ro: Nếu bạn không hài lòng bạn có thể nhận lại 100% số tiền mình bỏ ra chỉ với 1 cú nhấp chuốt."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     volume_label: "Âm lượng"
     music_label: "Âm nhạc"
     music_description: "Bật/tắt nhạc nền."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
     editor_config_level_language_label: "Ngôn ngữ lập trình cho bàn này"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    nick_blurb: "Motivation Guru"
     michael_title: "Lập trình viên"
 #    michael_blurb: "Sys Admin"
-    matt_title: "Lập trình viên"
+    matt_title: "Lập trình viên" # {change}
     matt_blurb: "Một người thích đi xe đạp"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/zh-HANS.coffee

@@ -1,7 +1,7 @@
 module.exports = nativeDescription: "简体中文", englishDescription: "Chinese (Simplified)", translation:
   home:
     slogan: "通过游戏学习编程"
-    no_ie: "抱歉！ Internet Explorer 8 等旧式预览器无法使用本网站。" # Warning that only shows up in IE8 and older
+    no_ie: "抱歉！ Internet Explorer 8 等老式浏览器无法使用本网站。" # Warning that only shows up in IE8 and older
     no_mobile: "CodeCombat不是针对手机设备设计的，所以可能无法达到最好的体验！" # Warning that shows up on mobile devices
     play: "开始游戏" # The big play button that opens up the campaign view.
     old_browser: "噢, 你的浏览器太老了, 不能运行CodeCombat. 抱歉!" # Warning that shows up on really old Firefox/Chrome/Safari
@@ -64,7 +64,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     achievements: "成就" # Tooltip on achievement list button from /play
     account: "账户" # Tooltip on account button from /play
     settings: "设置" # Tooltip on settings button from /play
-#    poll: "Poll" # Tooltip on poll button from /play
+    poll: "投票" # Tooltip on poll button from /play
     next: "下一步" # Go from choose hero to choose inventory before playing a level
     change_hero: "重新选择英雄" # Go back from choose inventory to choose hero
     choose_inventory: "装备道具"
@@ -74,7 +74,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     anonymous: "匿名玩家"
     level_difficulty: "难度："
     campaign_beginner: "新手作战"
-    awaiting_levels_adventurer_prefix: "我们每周开放五个关卡"
+    awaiting_levels_adventurer_prefix: "我们每周开放五个关卡" # {change}
     awaiting_levels_adventurer: "注册成为冒险家"
     awaiting_levels_adventurer_suffix: "来优先尝试新关卡"
     adjust_volume: "音量调节"
@@ -96,8 +96,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
   share_progress_modal:
     blurb: "你的进度真快！快告诉其他人你从CodeCombat学到了什么！" # {change}
     email_invalid: "邮件地址不可用。"
-    form_blurb: "输入他们的邮件地址，我们会让他们知道CodeCombat的有趣"
-    form_label: "邮件地址"
+    form_blurb: "输入他们的邮件地址，让他们知道CodeCombat的有趣"
+    form_label: "您的邮件地址"
     placeholder: "邮件地址"
     title: "你做的太好了！"
 
@@ -261,8 +261,9 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     victory_hour_of_code_done_yes: "是的, 完成了!"
     victory_experience_gained: "获得经验"
     victory_gems_gained: "获得宝石"
-#    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
-#    victory_become_a_viking: "Become a Viking"
+    victory_new_item: "新的物品"
+    victory_viking_code_school: "这关真的超难! 如果你想成为一个软件开发人员，你就应该去试一下Viking Code School。在这里你可以把你的知识增长到另一个台阶。只需要14周你就能成为一个专业的网页开发人员。"
+    victory_become_a_viking: "成为一个维京人吧"
     guide_title: "指南"
     tome_minion_spells: "助手的咒语" # Only in old-style levels.
     tome_read_only_spells: "只读的咒语" # Only in old-style levels.
@@ -337,7 +338,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_adding_evil: "加入万恶的压力。"
     tip_hate_computers: "那些认为他们讨厌电脑的人，其实他们讨厌的是垃圾程序编写员。- Larry Niven"
     tip_open_source_contribute: "你可以帮助「CodeCombat」提高！"
-#    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
+    tip_recurse: "迭代为人，递归为神 - L. Peter Deutsch"
 
   game_menu:
     inventory_tab: "道具箱"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     feature4: "每月享有3500额外宝石"
     feature5: "视频教学"
     feature6: "专业邮件支援"
+    feature7: "私人 <strong>氏族</strong>"
     free: "免费"
     month: "月"
     subscribe_title: "订阅"
@@ -425,19 +427,19 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     parent_email_title: "什么是你父母的邮件地址？"
     parents: "致家长"
     parents_title: "您的孩子将要学习编写程序。" # {change}
-    parents_blurb1: "通过使用CodeCombat，您的孩子将学习编写真正的程序代码。他们将学到简单指令，进而处理更复杂的问题。" # {change}
-#    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
+    parents_blurb1: "通过使用CodeCombat，您的孩子将学习编写真正的程序代码。他们将学到简单指令，进而处理更复杂的问题。"
+    parents_blurb1a: "不用怀疑计算机编程能力将是你的孩子作为一个成年人的基本技能。到2020年，77%的工作将会需要编码能力，并且软件工程师将在世界各地成为高需求职业。你知道吗，计算机科学是收入最高的大学学位？"
     parents_blurb2: "每月支付9.9美元，他们每周都会有新的挑战，并且通过电子邮件获得专业程序员的指导。" # {change}
     parents_blurb3: "无风险承诺：100%退款，一键退款。"
-#    payment_methods: "Payment Methods"
-#    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay."
-#    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
+    payment_methods: "付费方式"
+    payment_methods_title: "可接受的付款方式"
+    payment_methods_blurb1: "我们现有的付费方式有信用卡和支付宝"
+    payment_methods_blurb2: "如果你想用其他付费方式,请联系我们"
     stripe_description: "每月订阅"
     subscription_required_to_play: "订阅后才可开始本关"
     unlock_help_videos: "订阅后才可以解锁视频教学哦！"
-#    personal_sub: "Personal Subscription" # Accounts Subscription View below
-#    loading_info: "Loading subscription information..."
+    personal_sub: "个人订阅" # Accounts Subscription View below
+    loading_info: "正在读入订阅内容..."
 #    managed_by: "Managed by"
 #    will_be_cancelled: "Will be cancelled on"
 #    currently_free: "You currently have a free subscription"
@@ -491,7 +493,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     skills: "技能"
 #    attack_1: "Deals"
 #    attack_2: "of listed"
-#    attack_3: "weapon damage."
+    attack_3: "武器攻击力."
 #    health_1: "Gains"
 #    health_2: "of listed"
 #    health_3: "armor health."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     volume_label: "音量"
     music_label: "音乐"
     music_description: "开/关背景音乐"
-    autorun_label: "自动运行"
-    autorun_description: "控制是否自动运行代码"
     editor_config: "编辑器配置"
     editor_config_title: "编辑器配置"
     editor_config_level_language_label: "本关卡编程语言"
@@ -570,13 +570,13 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     nick_blurb: "充满动力的大牛"
     michael_title: "程序员"
     michael_blurb: "系统管理员"
-    matt_title: "程序员"
+    matt_title: "程序员" # {change}
     matt_blurb: "自行车爱好者"
-#    cat_title: "Chief Artisan"
+    cat_title: "首席关卡设计师"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
-#    josh_blurb: "Floor Is Lava"
-#    jose_title: "Music"
+    josh_title: "游戏设计师"
+    josh_blurb: "地面是熔岩"
+    jose_title: "音乐"
 #    jose_blurb: "Taking Off"
 #    retrostyle_title: "Illustration"
 #    retrostyle_blurb: "RetroStyle Games"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"
@@ -946,7 +947,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     fight: "战斗！"
     watch_victory: "观看你的胜利"
     defeat_the: "击败了"
-#    tournament_started: ", started"
+    tournament_started: "，锦标赛已开始"
     tournament_ends: "锦标赛结束"
     tournament_ended: "Tournament ended"
     tournament_rules: "锦标赛规则"

app/locale/zh-HANT.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     anonymous: "匿名玩家"
     level_difficulty: "難度"
     campaign_beginner: "新手指南"
-    awaiting_levels_adventurer_prefix: "我們每周將釋出五個等級。"
+    awaiting_levels_adventurer_prefix: "我們每周將釋出五個等級。" # {change}
     awaiting_levels_adventurer: "註冊成為冒險家"
     awaiting_levels_adventurer_suffix: "成為第一個挑戰新關卡的冒險家吧!"
     adjust_volume: "調整音量"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     victory_hour_of_code_done_yes: "是的，我完成了我的程式碼！"
     victory_experience_gained: "取得經驗值"
     victory_gems_gained: "取得寶石"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "指南"
@@ -404,6 +405,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     feature4: "每個月<strong>3500顆額外寶石</strong>!"
     feature5: "視頻教學"
     feature6: "頂級信箱支援"
+#    feature7: "Private <strong>Clans</strong>"
     free: "免費"
     month: "月"
     subscribe_title: "訂閱"
@@ -425,7 +427,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     parent_email_title: "您父母信箱是?"
     parents: "致家長"
     parents_title: "您的孩子將學習編寫程式." # {change}
-    parents_blurb1: "使用 CodeCombat , 您的孩子學習真正的編寫程式. 他們學習從簡單的指令，漸進到更加進階的課題." # {change}
+    parents_blurb1: "使用 CodeCombat , 您的孩子學習真正的編寫程式. 他們學習從簡單的指令，漸進到更加進階的課題."
 #    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
     parents_blurb2: "每月支付 $9.99 美金, 他們每週獲得新挑戰以及使用信件取得專業程式員的幫助." # {change}
     parents_blurb3: "沒有風險: 保證 100% 退費, 一步取消訂閱."
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     volume_label: "音量"
     music_label: "音樂"
     music_description: "開關背景音樂。"
-    autorun_label: "自動執行"
-    autorun_description: "控制自動執行程式。"
     editor_config: "設定編輯器"
     editor_config_title: "編輯器設定值"
     editor_config_level_language_label: "本關卡使用的語言"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     nick_blurb: "亢奮的Guru"
     michael_title: "程式員"
     michael_blurb: "系統管理員"
-    matt_title: "程式員"
+    matt_title: "程式員" # {change}
     matt_blurb: "競速單車玩家"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/zh-WUU-HANS.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    anonymous: "Anonymous Player"
 #    level_difficulty: "Difficulty: "
 #    campaign_beginner: "Beginner Campaign"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
 #    guide_title: "Guide"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/locale/zh-WUU-HANT.coffee

@@ -74,7 +74,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    anonymous: "Anonymous Player"
     level_difficulty: "難度："
     campaign_beginner: "新手打仗"
-#    awaiting_levels_adventurer_prefix: "We release five levels per week."
+#    awaiting_levels_adventurer_prefix: "We release new levels every week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
 #    adjust_volume: "Adjust volume"
@@ -261,6 +261,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     victory_hour_of_code_done_yes: "正是, 妝下落爻！"
 #    victory_experience_gained: "XP Gained"
 #    victory_gems_gained: "Gems Gained"
+#    victory_new_item: "New Item"
 #    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
 #    victory_become_a_viking: "Become a Viking"
     guide_title: "指南"
@@ -400,10 +401,11 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
 #    feature1: "80+ basic levels across 4 worlds"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
-#    feature3: "50+ bonus levels"
+#    feature3: "60+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
 #    feature5: "Video tutorials"
 #    feature6: "Premium email support"
+#    feature7: "Private <strong>Clans</strong>"
 #    free: "Free"
 #    month: "month"
 #    subscribe_title: "Subscribe"
@@ -528,8 +530,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    volume_label: "Volume"
 #    music_label: "Music"
 #    music_description: "Turn background music on/off."
-#    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
     editor_config: "編寫器設定"
     editor_config_title: "編寫器設定"
 #    editor_config_level_language_label: "Language for This Level"
@@ -570,7 +570,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    nick_blurb: "Motivation Guru"
 #    michael_title: "Programmer"
 #    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
 #    cat_title: "Chief Artisan"
 #    cat_blurb: "Airbender"
@@ -586,16 +586,17 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
+#    free_1: "CodeCombat Basic is FREE! There are 80+ free levels which cover every concept."
 #    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
 #    teacher_subs_title: "Teachers get free subscriptions!"
 #    teacher_subs_1: "Please contact"
 #    teacher_subs_2: "to set up a free monthly subscription."
 #    sub_includes_title: "What is included in the subscription?"
 #    sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "50+ practice levels"
+#    sub_includes_2: "60+ practice levels"
 #    sub_includes_3: "Video tutorials"
+#    sub_includes_7: "Private Clans"
 #    sub_includes_4: "Premium email support"
 #    sub_includes_5: "7 new heroes with unique skills to master"
 #    sub_includes_6: "3500 bonus gems every month"
@@ -603,8 +604,8 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
 #    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
 #    material_title: "How much material is there?"
-#    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+#    material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
+#    material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
 #    concepts_title: "What concepts are covered?"
 #    how_much_title: "How much does a monthly subscription cost?"
 #    how_much_1: "A"

app/models/ThangType.coffee

@@ -12,17 +12,24 @@ module.exports = class ThangType extends CocoModel
   @heroes:
     captain: '529ec584c423d4e83b000014'
     knight: '529ffbf1cf1818f2be000001'
-    'samurai': '53e12be0d042f23505c3023b'
-    'ninja': '52fc0ed77e01835453bd8f6c'
+    samurai: '53e12be0d042f23505c3023b'
+    raider: '55527eb0b8abf4ba1fe9a107'
+    goliath: ''
+    guardian: ''
+    ninja: '52fc0ed77e01835453bd8f6c'
     'forest-archer': '5466d4f2417c8b48a9811e87'
     trapper: '5466d449417c8b48a9811e83'
+    pixie: ''
+    assassin: ''
     librarian: '52fbf74b7e01835453bd8d8e'
     'potion-master': '52e9adf7427172ae56002172'
     sorcerer: '52fd1524c7e6cf99160e7bc9'
+    necromancer: ''
+    'dark-wizard': ''
   @heroClasses:
-    Warrior: ['captain', 'knight', 'samurai']
-    Ranger: ['ninja', 'forest-archer', 'trapper']
-    Wizard: ['librarian', 'potion-master', 'sorcerer']
+    Warrior: ['captain', 'knight', 'samurai', 'raider', 'goliath', 'guardian']
+    Ranger: ['ninja', 'forest-archer', 'trapper', 'pixie', 'assassin']
+    Wizard: ['librarian', 'potion-master', 'sorcerer', 'necromancer', 'dark-wizard']
   @items:
     'simple-boots': '53e237bf53457600003e3f05'
   urlRoot: '/db/thang.type'

app/schemas/models/clan.schema.coffee

@@ -1,5 +1,7 @@
 c = require './../schemas'
 
+# TODO: Require name to be non-empty
+
 ClanSchema = c.object {title: 'Clan', required: ['name', 'type']}
 c.extendNamedProperties ClanSchema  # name first
 
@@ -7,7 +9,8 @@ _.extend ClanSchema.properties,
   description: {type: 'string'}
   members: c.array {title: 'Members'}, c.objectId()
   ownerID: c.objectId()
-  type: {type: 'string', 'enum': ['public']}
+  type: {type: 'string', 'enum': ['public', 'private'], description: 'Controls clan general visibility.'}
+  dashboardType: {type: 'string', 'enum': ['basic', 'premium']}
 
 c.extendBasicProperties ClanSchema, 'Clan'
 

app/schemas/models/level.coffee

@@ -77,7 +77,7 @@ GoalSchema = c.object {title: 'Goal', description: 'A goal that the player can a
   optional: {title: 'Optional', description: 'Optional goals do not need to be completed for overallStatus to be success.', type: 'boolean'}
   team: c.shortString(title: 'Team', description: 'Name of the team this goal is for, if it is not for all of the playable teams.')
   killThangs: c.array {title: 'Kill Thangs', description: 'A list of Thang IDs the player should kill, or team names.', uniqueItems: true, minItems: 1, 'default': ['ogres']}, thang
-  saveThangs: c.array {title: 'Save Thangs', description: 'A list of Thang IDs the player should save, or team names', uniqueItems: true, minItems: 1, 'default': ['humans']}, thang
+  saveThangs: c.array {title: 'Save Thangs', description: 'A list of Thang IDs the player should save, or team names', uniqueItems: true, minItems: 1, 'default': ['Hero Placeholder']}, thang
   getToLocations: c.object {title: 'Get To Locations', description: 'Will be set off when any of the \"who\" touch any of the \"targets\"', required: ['who', 'targets']},
     who: c.array {title: 'Who', description: 'The Thangs who must get to the target locations.', minItems: 1}, thang
     targets: c.array {title: 'Targets', description: 'The target locations to which the Thangs must get.', minItems: 1}, thang
@@ -261,7 +261,7 @@ LevelSchema = c.object {
     type: 'hero'
     goals: [
       {id: 'ogres-die', name: 'Ogres must die.', killThangs: ['ogres'], worldEndsAfter: 3}
-      {id: 'humans-survive', name: 'Humans must survive.', saveThangs: ['humans'], howMany: 1, worldEndsAfter: 3, hiddenGoal: true}
+      {id: 'humans-survive', name: 'Your hero must survive.', saveThangs: ['Hero Placeholder'], howMany: 1, worldEndsAfter: 3, hiddenGoal: true}
     ]
 }
 c.extendNamedProperties LevelSchema  # let's have the name be the first property

app/schemas/models/user.coffee

@@ -63,10 +63,10 @@ _.extend UserSchema.properties,
   githubID: {type: 'integer', title: 'GitHub ID'}
   gplusID: c.shortString({title: 'G+ ID'})
 
-  wizardColor1: c.pct({title: 'Wizard Clothes Color'})
+  wizardColor1: c.pct({title: 'Wizard Clothes Color'})  # No longer used
   volume: c.pct({title: 'Volume'})
   music: { type: 'boolean' }
-  autocastDelay: { type: 'integer' }
+  autocastDelay: { type: 'integer' }  # No longer used
   lastLevel: { type: 'string' }
   heroConfig: c.HeroConfigSchema
 

app/schemas/subscriptions/god.coffee

@@ -35,6 +35,7 @@ module.exports =
 
   'god:infinite-loop': c.object {required: ['firstWorld']},
     firstWorld: {type: 'boolean'}
+    nonUserCodeProblem: {type: 'boolean'}
 
   'god:new-world-created': worldUpdatedEventSchema
 

app/styles/admin/analytics-subscriptions.sass

@@ -46,3 +46,15 @@
       z-index: 3
       background-color: blanchedalmond
       font-size: 10pt
+
+  .subscribers-thead
+    font-size: 10pt
+    th
+      padding: 2px
+
+  .subscribers-tbody
+    font-size: 9pt
+    td
+      padding: 2px
+      max-width: 160px
+      overflow: hidden

app/styles/clans/clan-details.sass

@@ -1,5 +1,8 @@
 #clan-details-view
 
+  th
+    font-size: 16px
+
   .join-clan-link
     width: 390px
 
@@ -7,13 +10,112 @@
     font-weight: bold
 
   .stats-table
-    width: 240px
+    width: 400px
     background: rgba(0, 0, 0, 0.0)
 
+  #editDescriptionModal .modal-dialog
+    background-color: white
+
+  #editNameModal .modal-dialog
+    background-color: white
+    max-width: 400px
+
+  .edit-description-input
+    width: 100%
+
+  .edit-name-input
+    width: 100%
+
   $spriteSheetSize: 30px
 
-  td.hero-icon-cell
+  .remove-hero-cell
+    width: 100px
+
+  .hero-icon-cell
+    display: inline-block
     width: 30px
+    height: 50px
+    margin: 0px 2px
+    vertical-align: middle
+
+  .level-cell
+    width: 50px
+    text-align: center
+    vertical-align: middle
+
+  .name-cell
+    width: 100px
+    vertical-align: middle
+
+  .achievements-cell
+    text-align: center
+    vertical-align: middle
+
+  .latest-achievement-cell
+    vertical-align: middle
+
+
+  .progress-header
+    margin-right: 14px
+
+  .progress-key
+    cursor: default
+    display: inline-block
+    white-space: nowrap
+    font-size: 9pt
+    font-weight: normal
+    border: 1px solid gray
+    border-radius: 5px
+    margin: 0px
+    padding: 2px
+
+  .progress-key-started
+    background-color: lightgreen
+
+  .progress-key-complete
+    background-color: lightgray
+
+  .expand-progress-checkbox
+    margin-left: 14px
+
+  .expand-progress-label
+    font-weight: normal
+    font-size: 14px
+
+  .progress-cell
+    padding: 2px
+    padding-bottom: 10px
+
+    .level-popup-container
+      display: none
+      position: absolute
+      padding: 10px
+      border: 1px solid black
+      z-index: 3
+      background-color: blanchedalmond
+      font-size: 10pt
+
+  .level-progression-campaign
+    font-size: 12pt
+    font-weight: bold
+    margin-top: 4px
+
+  .progress-level-cell
+    display: inline-block
+    white-space: nowrap
+    font-size: 9pt
+    border: 1px solid gray
+    border-radius: 5px
+    margin: 0px
+    padding: 2px
+
+  .progress-level-cell-started
+    cursor: pointer
+    background-color: lightgreen
+
+  .progress-level-cell-complete
+    cursor: pointer
+    background-color: lightgray
 
   .player-hero-icon
     background: transparent url(/images/pages/play/play-spritesheet.png)
@@ -23,6 +125,7 @@
     width: 30px
     height: 30px
     margin: 0px 2px
+    vertical-align: middle
 
   .player-hero-icon
     background-position: (-4 * $spriteSheetSize) 0

app/styles/clans/clans.sass

@@ -6,3 +6,12 @@
 
   .create-clan-description
     width: 50%
+
+  .popover
+    max-width: 100%
+
+    h3
+      background: transparent
+      border: 0
+      font-size: 30px
+      color: black

app/styles/modal/subscribe-modal.sass

@@ -90,6 +90,9 @@
     top: 160px
     width: 450px
     background: rgba(0, 0, 0, 0.0)
+    border-width: 0px
+    .free-cell
+      border-right-width: 1px
     thead
       tr
         th
@@ -99,10 +102,19 @@
           font-weight: 700
           line-height: 1.1
           color: #317EAC
+          padding: 4px
+          border-width: 0px
+          border-color: rgba(85, 85, 85, 0.1)
     tbody
       font-size: 14px
       .center-ok
         text-align: center
+      tr
+        td
+          padding: 3px
+          border-width: 0px
+          border-top-width: 1px
+          border-color: rgba(85, 85, 85, 0.1)
 
   //- Parent info popover link
 

app/styles/play/level/modal/hero-victory-modal.sass

@@ -253,6 +253,15 @@
         font-weight: bold
         color: rgb(40, 33, 22)
         margin-right: 12px
+        width: 78px
+
+        &.four-digits
+          font-size: 40px
+          margin-top: 3px
+
+        &.five-digits
+          font-size: 30px
+          margin-top: 10px
 
       .total-label
         float: left

app/styles/play/modal/play-heroes-modal.sass

@@ -7,23 +7,23 @@ $heroCanvasHeight: 275px
   @include user-select(none)
 
   //- Clear modal defaults
-  
+
   .modal-dialog
     padding: 0
     width: 820px
     height: 658px
-  
-  
+
+
   //- Background
-  
+
   #play-heroes-background
     position: absolute
     top: -59px
     left: -20px
-    
-    
+
+
   //- Header
-  
+
   h1
     position: absolute
     left: 154px
@@ -67,9 +67,9 @@ $heroCanvasHeight: 275px
     &:hover
       color: yellow
 
-    
+
   //- Carousel character portraits
-  
+
   #hero-carousel
     width: 750px
     height: 386px
@@ -87,7 +87,7 @@ $heroCanvasHeight: 275px
         margin-left: 0
 
         .hero-indicator
-          width: 104px
+          width: 97px
           height: 98px
           margin: 0 -11px
           position: relative
@@ -131,27 +131,27 @@ $heroCanvasHeight: 275px
 
 
   //- Small transformations to jumble the hero icons a little
-  
+
   .hero-index-0
     transform: rotate(-5deg)
     z-index: 2
-  
+
   .hero-index-1
     top: -3px
     z-index: 1
-    
+
   .hero-index-2
     top: -3px
     transform: rotate(5deg)
     z-index: 1
-  
+
   .hero-index-3
     transform: rotate(-1deg)
     z-index: 0
 
   .hero-index-4
     transform: rotate(3deg)
-    
+
   .hero-index-5
     z-index: 0
 
@@ -159,7 +159,7 @@ $heroCanvasHeight: 275px
     transform: rotate(6deg)
     top: -8px
     z-index: 1
-  
+
   .hero-index-8
     transform: rotate(4deg)
 
@@ -176,7 +176,7 @@ $heroCanvasHeight: 275px
         width: 334px
         height: $heroCanvasHeight
         float: left
-        
+
       .hero-stats
         width: 400px
         height: $heroCanvasHeight
@@ -196,23 +196,23 @@ $heroCanvasHeight: 275px
         h2
           margin-top: 0px
           color: white
-          
+
         .hero-description
           margin-bottom: 4px
-        
+
         .hero-stat-row
           margin: 3px 0
-          
+
           .stat-label
             float: left
             width: 100px
             color: rgb(203,170,148)
-    
+
           .stat-value
             display: inline-block
             width: 280px
             color: rgb(244,189,68)
-            
+
           .stat-progress
             background: rgb(32,27,22)
             height: 15px
@@ -222,24 +222,24 @@ $heroCanvasHeight: 275px
             top: 2px
             left: -3px
             width: 70%
-            
+
             .stat-progress-bar
               height: 7px
               border-radius: 7px
-              
-    
+
+
           &.attack .stat-progress-bar
             background: #c32424
-      
+
           &.health .stat-progress-bar
             background: #0f802a
-    
+
           &.speed .stat-progress-bar
             background: #4d52ab
 
-    
+
     //- Carousel switch buttons
-    
+
     a.left, a.right
       color: rgb(74,61,51)
       position: absolute
@@ -247,15 +247,15 @@ $heroCanvasHeight: 275px
       width: 40px
       height: 84px
       font-size: 24px
-      
+
       .glyphicon
         position: relative
         top: 27px
         left: 8px
-      
+
       &:hover, &:active
         color: rgb(126,105,88)
-    
+
     a.right
       right: -49px
 
@@ -312,7 +312,7 @@ $heroCanvasHeight: 275px
     border: 3px solid rgb(7,65,83)
     background: rgb(0,119,168)
     border-radius: 0
-    
+
     &:disabled
       background: rgb(72, 106, 113)
       opacity: 1
@@ -327,7 +327,7 @@ $heroCanvasHeight: 275px
   //#restricted-hero-button
 
   //- Programming select box
-  
+
   .form
     position: absolute
     left: 32px
@@ -335,33 +335,33 @@ $heroCanvasHeight: 275px
     width: 541px
     height: 102px
     padding: 10px 40px
-    
+
     .help-block
       color: rgb(51,51,51)
       font-size: 14px
       font-weight: bold
-  
+
     select
       font-size: 18px
-  
+
     .fancy-select
       display: inline-block
       width: 100%
 
       .options
         text-transform: none
-        
+
       .trigger, .options
         background-color: rgb(239,232,217)
         color: black
-        
+
       .trigger
         text-transform: uppercase
         border: 3px solid black
         font-size: 16px
         padding: 5px 10px
         width: 100%
-        
+
         //- the little triangle on the right side of the fancy select box
         &:after
           border: 8px solid transparent
@@ -397,7 +397,7 @@ $heroCanvasHeight: 275px
             background-image: url(/images/common/code_languages/lua_small.png)
           &[data-value="io"]
             background-image: url(/images/common/code_languages/io_small.png)
-    
+
   #confirm-button
     background: url(/images/pages/play/modal/confirm-button.png)
     width: 209px
@@ -411,15 +411,15 @@ $heroCanvasHeight: 275px
     font-size: 26px
     font-family: $headings-font-family
     color: white
-  
+
 
 body.ipad #play-heroes-modal
   // iPad is Python-only for now, and has its own reset button.
   .form
     display: none
-    
+
 body[lang='ru']
-  #play-heroes-modal 
+  #play-heroes-modal
     #hero-carousel .hero-item .hero-stats h2
       font-size: 24px
 

app/templates/account/subscription-view.jade

@@ -123,7 +123,8 @@ block content
     .panel.panel-default
       .panel-heading
         h3(data-i18n="subscribe.managed_subs")
-        div(data-i18n="subscribe.managed_subs_desc")
+        p(data-i18n="subscribe.managed_subs_desc")
+        p(data-i18n="subscribe.managed_subs_desc_2")
         h4(data-i18n="subscribe.group_discounts")
         table.table.table-striped.table-condensed.discount-table
           tr 

app/templates/admin/analytics-subscriptions.jade

@@ -24,7 +24,7 @@ block content
             div.description 30 Day Total Growth
             div.count #{monthlyGrowth.toFixed(1)}%
           .col-md-5.big-stat.churn-count
-            div.description Monthly Churn
+            div.description Monthly Churn (cancelled / total)
             div.count #{monthlyChurn.toFixed(1)}%
 
       each graph in analytics.graphs
@@ -36,48 +36,102 @@ block content
                 each value in point.values
                   div #{value}
 
-      div *Stripe APIs do not return information about inactive subs.
-
     h2 Recent Subscribers
     if !subscribers || subscribers.length < 1
       h4 Fetching recent subscribers...
     else
-      table.table.table-condensed
-        thead
+      table.table.table-striped.table-condensed
+        thead.subscribers-thead
           tr
+            th Sub ID
             th User Start
             th Sub Start
             if subscriberCancelled
               th Cancelled
             else
               th
-            th
-            //- th Name
+            th Conversion
             th Email
             th Hero
             th Level
-            th Last Level
             th Age
             th Spoken
-        tbody
+            th Clans
+        tbody.subscribers-tbody
           each subscriber in subscribers
             tr
+              td
+                a(href="https://dashboard.stripe.com/customers/#{subscriber.customerID}", target="_blank")= subscriber.subscriptionID
               td= subscriber.user.dateCreated.substring(0, 10)
               td= subscriber.start.substring(0, 10)
               td
                 if subscriber.cancel
                   span= subscriber.cancel.substring(0, 10)
               td
-                if subscriber.user.stripe.sponsorID
-                  span Sponsored
-              //- td
-              //-   a(href="/user/#{subscriber.user._id}")= subscriber.user.name || 'Anoner'
-              td= subscriber.user.emailLower
+                if subscriber.user.stripe && subscriber.user.stripe.sponsorID
+                  span *sponsored*
+                else if subscriber.user.conversion
+                  span= subscriber.user.conversion
+              if subscriber.user.deleted
+                td DELETED
+              else
+                td= subscriber.user.emailLower
               td= subscriber.hero
               td= subscriber.level
-              td= subscriber.user.lastLevel
               td= subscriber.user.ageRange
               td= subscriber.user.preferredLanguage
+              if subscriber.user.clans
+                td= subscriber.user.clans.length
+              else
+                td
+
+    h2 Recent Cancellations
+    if !cancellations || cancellations.length < 1
+      h4 Fetching recent cancellations...
+    else
+      table.table.table-striped.table-condensed
+        thead.subscribers-thead
+          tr
+            th Sub ID
+            th User ID
+            th User Start
+            th Sub Start
+            th Sub Cancel
+            th Length
+            th Level
+            th Age
+            th Spoken
+            th Clans
+        tbody.subscribers-tbody
+          each cancellation in cancellations
+            tr
+              td
+                a(href="https://dashboard.stripe.com/customers/#{cancellation.customerID}", target="_blank")= cancellation.subscriptionID
+              if cancellation.userID
+                td
+                  a(href="/user/#{cancellation.userID}")= cancellation.userID
+              else
+                td
+              if cancellation.user
+                td= cancellation.user.dateCreated.substring(0, 10)
+              else
+                td
+              td= cancellation.start.substring(0, 10)
+              td= cancellation.cancel.substring(0, 10)
+              td= moment.duration(new Date(cancellation.cancel) - new Date(cancellation.start)).humanize()
+              td= cancellation.level
+              if cancellation.user
+                td= cancellation.user.ageRange
+                td= cancellation.user.preferredLanguage
+                if cancellation.user.clans
+                  td= cancellation.user.clans.length
+                else
+                  td
+              else
+                td
+                td
+                td
+                td
 
     h2 Subscriptions
     if !subs || subs.length < 1
@@ -90,8 +144,9 @@ block content
             th Total
             th Started
             th Cancelled
-            th Net
+            th Net (cancelled)
             th Ended
+            th Net (ended)
         tbody
           each sub in subs
             tr
@@ -101,3 +156,4 @@ block content
               td= sub.cancelled
               td= sub.started - sub.cancelled
               td= sub.ended
+              td= sub.started - sub.ended

app/templates/base.jade

@@ -8,11 +8,11 @@ block header
       a(href="/")
         span.glyphicon.glyphicon-home
       a(href="/about", data-i18n="nav.about")
+      a(href='/teachers', data-i18n="nav.teachers") Teachers
       a(href='/clans') Clans
-      //a(href='/play/ladder', data-i18n="home.multiplayer").multiplayer-nav-link
-      a(href='/community', data-i18n="nav.community")
-      a(href='http://blog.codecombat.com/', data-i18n="nav.blog")
       a(href='http://discourse.codecombat.com/', data-i18n="nav.forum")
+      a(href='/community', data-i18n="nav.community")
+      //a(href='/play/ladder', data-i18n="home.multiplayer").multiplayer-nav-link
 
       if me.get('anonymous') === false
         span.dropdown
@@ -58,10 +58,10 @@ block footer
     img#footer-background(src="/images/pages/base/nav_background.png")
 
     #footer-links
+      a(tabindex=-1, data-toggle="coco-modal", data-target="core/ContactModal", data-i18n="nav.contact") Contact
+      a(href='http://blog.codecombat.com/', data-i18n="nav.blog")
       a(href='/contribute', tabindex=-1, data-i18n="nav.contribute") Contribute
       a(href='/legal', tabindex=-1, data-i18n="nav.legal") Legal
-      a(tabindex=-1, data-toggle="coco-modal", data-target="core/ContactModal", data-i18n="nav.contact") Contact
-      a(href='/teachers', data-i18n="nav.teachers") Teachers
       a(href="/play-old", data-i18n="play.older_campaigns") Older Campaigns
       if me.isAdmin()
         a(href='/admin', data-i18n="nav.admin") Admin
@@ -73,7 +73,7 @@ block footer
           .fb-like(data-href="https://www.facebook.com/codecombat", data-send="false", data-layout="button_count", data-width="350", data-show-faces="true", data-ref="coco_footer_#{fbRef}")
           if !isIE
             a.twitter-follow-button(href="https://twitter.com/CodeCombat", data-show-count="true", data-show-screen-name="false", data-dnt="true", data-align="right", data-i18n="nav.twitter_follow") Follow
-            iframe.github-star-button(src="http://ghbtns.com/github-btn.html?user=codecombat&repo=codecombat&type=watch&count=true", allowtransparency="true", frameborder="0", scrolling="0", width="110", height="20")
+            iframe.github-star-button(src="https://ghbtns.com/github-btn.html?user=codecombat&repo=codecombat&type=watch&count=true", allowtransparency="true", frameborder="0", scrolling="0", width="110", height="20")
     
     #footer-credits
       span 

app/templates/clans/clan-details.jade

@@ -2,12 +2,44 @@ extends /templates/base
 
 block content
 
+  .modal#editNameModal
+    .modal-dialog
+      .modal-header
+        button.close(data-dismiss='modal')
+          span ×
+        h3.modal-title Edit Clan Name
+      .modal-body
+        input.edit-name-input(type='text' value="#{clan.get('name')}")
+      .modal-footer
+        button.btn(data-dismiss='modal') Close
+        button.btn.edit-name-save-btn Save changes
+
+  .modal#editDescriptionModal
+    .modal-dialog
+      .modal-header
+        button.close(data-dismiss='modal')
+          span ×
+        h3.modal-title Edit Clan Description
+      .modal-body
+        textarea.edit-description-input(rows=2)= clan.get('description')
+      .modal-footer
+        button.btn(data-dismiss='modal') Close
+        button.btn.edit-description-save-btn Save changes
+
   if clan
-    h1= clan.get('name')
+    h1 #{clan.get('name')}
+      if clan.get('type') === 'private'
+        small (private)
+      if clan.get('ownerID') === me.id
+        span.spl
+          button.btn.btn-xs.edit-name-btn(data-toggle='modal', data-target='#editNameModal') edit name
+
     if clan.get('description')
       .clan-description
         each line in clan.get('description').split('\n')
           p= line
+    if clan.get('ownerID') === me.id
+      button.btn.btn-xs.edit-description-btn(data-toggle='modal', data-target='#editDescriptionModal') edit description
 
   h5 Summary
   table.table.table-condensed.stats-table
@@ -22,10 +54,10 @@ block content
       tr
         td Average Level
         td= stats.averageLevel
-    if stats.totalAchievements
+    if stats.averageAchievements && clan.get('type') === 'public'
       tr
-        td Total Achievements
-        td= stats.totalAchievements
+        td Average Achievements
+        td= stats.averageAchievements
 
   p
     if isOwner
@@ -35,40 +67,119 @@ block content
     else
       button.btn.btn-lg.btn-success.join-clan-btn Join Clan
 
-  div
-    span.spl.spr.join-link-prompt Invite:
-    input.join-clan-link(type="text", readonly, value="#{joinClanLink}")
-  .small *Invite players to this Clan by sending them this link.
+  if clan.get('ownerID') === me.id || clan.get('type') === 'public'
+    div
+      span.spl.spr.join-link-prompt Invite:
+      input.join-clan-link(type="text", readonly, value="#{joinClanLink}")
+    .small *Invite players to this Clan by sending them this link.
 
   if members
-    h3 Heroes (#{members.length})
-    table.table.table-striped.table-condensed
-      thead
-        tr
-          th
-          th 
-          td Name
-          th Level
-          th Achievements
-          th Latest Achievement
-          th  
-      tbody
-        each member in members
+    h3 Members (#{members.length})
+
+    //- Premium dashboard
+    if clan.get('dashboardType') === 'premium'
+      table.table.table-condensed
+        thead
           tr
-            td.hero-icon-cell
-              span.spr.player-hero-icon(data-memberid="#{member.id}")
-            td.code-language-cell
-              if memberLanguageMap && memberLanguageMap[member.id]
-                span.code-language-cell(style="background-image: url(/images/common/code_languages/#{memberLanguageMap[member.id]}_small.png)", title=memberLanguageMap[member.id])
-            td  
-              a(href="/user/#{member.id}")= member.get('name') || 'Anoner'
-            td= member.level()
-            td
-              if memberAchievementsMap && memberAchievementsMap[member.id]
-                | #{memberAchievementsMap[member.id].length}
-            td
-              if memberAchievementsMap && memberAchievementsMap[member.id] && memberAchievementsMap[member.id].length
-                span= memberAchievementsMap[member.id][0].get('achievementName')
+            th Hero
+            th 
+              span.progress-header Progress
+              span.progress-key not started
+              span.progress-key.progress-key-started started
+              span.progress-key.progress-key-complete complete
+              input.expand-progress-checkbox(type='checkbox')
+              span.spl.expand-progress-label Expand levels
+        tbody
+          each member in members
+            tr
             td
+              div
+                span.hero-icon-cell
+                  span.spr.player-hero-icon(data-memberid="#{member.id}")
+                span.code-language-cell
+                  if memberLanguageMap && memberLanguageMap[member.id]
+                    span.code-language-cell(style="background-image: url(/images/common/code_languages/#{memberLanguageMap[member.id]}_small.png)", title=memberLanguageMap[member.id])
+              div
+                a(href="/user/#{member.id}")= member.get('name') || 'Anoner'
+              div Level #{member.level()}
               if isOwner && member.id !== clan.get('ownerID')
-                  button.btn.btn-xs.btn-warning.remove-member-btn(data-id="#{member.id}") Remove Hero
+                button.btn.btn-xs.btn-warning.remove-member-btn(data-id="#{member.id}") Remove Hero
+            td.progress-cell
+
+              each campaign in campaignLevelProgressions
+                if lastUserCampaignLevelMap[member.id] && lastUserCampaignLevelMap[member.id][campaign.ID]
+                  div.level-progression-campaign= campaign.name
+                  - var i = 0
+
+                  each level in campaign.levels
+                    - i++
+                    - var state = null, levelInfo = null
+                    if memberLevelStateMap[member.id][level.slug]
+                      - levelInfo = memberLevelStateMap[member.id][level.slug].levelInfo
+                      - state = memberLevelStateMap[member.id][level.slug].state
+                    if state === 'complete'
+                      span.progress-level-cell.progress-level-cell-complete(data-level-info=levelInfo) #{i}
+                        if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1
+                          span.spl #{level.name}
+                        .level-popup-container
+                          h3 #{i}. #{levelInfo.level}
+                          p
+                            div Status: Complete
+                            div Playtime: #{levelInfo.playtime}s
+                            div Last played: #{levelInfo.changed}
+                          if isOwner || me.isAdmin()
+                            strong Click to view solution.
+                    else if state === 'started'
+                      span.progress-level-cell.progress-level-cell-started(data-level-info=levelInfo) #{i}
+                        if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1
+                          span.spl #{level.name}
+                        .level-popup-container
+                          h3 #{i}. #{level.name}
+                          p
+                            div Status: Started
+                            div Playtime: #{levelInfo.playtime}s
+                            div Last played: #{levelInfo.changed}
+                          if isOwner || me.isAdmin()
+                            strong Click to view solution.
+                    else
+                      span.progress-level-cell.level-progression-level-not-started #{i}
+                        if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1
+                          span.spl #{level.name}
+                        .level-popup-container
+                          h3 #{i}. #{level.name}
+                          div Status: Not Started
+                    if lastUserCampaignLevelMap[member.id][campaign.ID].levelSlug === level.slug
+                      - break
+
+    //- Basic dashboard
+    else
+      table.table.table-striped.table-condensed
+        thead
+          tr
+            th
+            th 
+            td.name-cell Name
+            th.level-cell Level
+            th.achievements-cell Achievements
+            th.latest-achievement-cell Latest Achievement
+            th  
+        tbody
+          each member in members
+            tr
+              td.hero-icon-cell
+                span.spr.player-hero-icon(data-memberid="#{member.id}")
+              td.code-language-cell
+                if memberLanguageMap && memberLanguageMap[member.id]
+                  span.code-language-cell(style="background-image: url(/images/common/code_languages/#{memberLanguageMap[member.id]}_small.png)", title=memberLanguageMap[member.id])
+              td.name-cell
+                a(href="/user/#{member.id}")= member.get('name') || 'Anoner'
+              td.level-cell= member.level()
+              td.achievements-cell
+                if memberAchievementsMap && memberAchievementsMap[member.id]
+                  | #{memberAchievementsMap[member.id].length}
+              td.latest-achievement-cell
+                if memberAchievementsMap && memberAchievementsMap[member.id] && memberAchievementsMap[member.id].length
+                  span= memberAchievementsMap[member.id][0].get('achievementName')
+              td
+                if isOwner && member.id !== clan.get('ownerID')
+                    button.btn.btn-xs.btn-warning.remove-member-btn(data-id="#{member.id}") Remove Hero

app/templates/clans/clans.jade

@@ -6,6 +6,12 @@ block content
     input.create-clan-name(type='text' placeholder='New clan name')
   p
     textarea.create-clan-description(rows=2, placeholder='New clan description')
+  p
+    input(type='checkbox').private-clan-checkbox
+    span.spl Make clan private
+    span.spl (
+    a.private-more-info subscribers only
+    span )
   p
     button.btn.btn-success.create-clan-btn Create New Clan
 
@@ -53,6 +59,7 @@ block content
             th Clan Name
             th Heroes
             th Chieftain
+            th Type
             th
         tbody
           if myClans.length
@@ -69,6 +76,7 @@ block content
                     a(href="/user/#{clan.get('ownerID')}")= idNameMap[clan.get('ownerID')]
                   else
                     a(href="/user/#{clan.get('ownerID')}") Anoner
+                td= clan.get('type')
                 td
                   if clan.get('ownerID') !== me.id
                     button.btn.btn-xs.btn-warning.leave-clan-btn(data-id="#{clan.id}") Leave Clan

app/templates/community-view.jade

@@ -12,7 +12,7 @@ block content
       a(href="/editor/level")
         img(src="/images/pages/community/level.png")
       h2 
-        a.spl(href="/editor/level", data-i18n="editor.level_title")
+        a(href="/editor/level", data-i18n="editor.level_title")
       p
         span.spr(data-i18n="community.level_editor_prefix") Use the CodeCombat
         a(href="/editor/level", data-i18n="editor.level_title")
@@ -22,7 +22,7 @@ block content
       a(href="/editor/thang")
         img(src="/images/pages/community/thang.png")
       h2
-        a.spl(href="/editor/thang", data-i18n="editor.thang_title")
+        a(href="/editor/thang", data-i18n="editor.thang_title")
       p
         span.spr(data-i18n="community.thang_editor_prefix") We call units within the game 'thangs'. Use the
         a(href="/editor/thang", data-i18n="editor.thang_title")
@@ -32,7 +32,7 @@ block content
       a(href="/editor/article")
         img(src="/images/pages/community/article.png")
       h2
-        a.spl(href="/editor/article", data-i18n="editor.article_title")
+        a(href="/editor/article", data-i18n="editor.article_title")
       p
         span.spr(data-i18n="community.article_editor_prefix") See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the
         a(href="/editor/article", data-i18n="editor.article_title")

app/templates/core/subscribe-modal.jade

@@ -21,7 +21,7 @@
           tr
             th
             if !me.get('chinaVersion')
-              th(data-i18n="subscribe.free")
+              th.free-cell(data-i18n="subscribe.free")
             th
               //- TODO: find a better way to localize '$9.99/month'
               span $#{price}/
@@ -31,7 +31,7 @@
             td.feature-description
               span(data-i18n="subscribe.feature1")
             if !me.get('chinaVersion')
-              td.center-ok
+              td.center-ok.free-cell
                 span.glyphicon.glyphicon-ok
             td.center-ok
               span.glyphicon.glyphicon-ok
@@ -39,35 +39,42 @@
             td.feature-description
               span(data-i18n="[html]subscribe.feature2")
             if !me.get('chinaVersion')
-              td 
+              td.free-cell
             td.center-ok
               span.glyphicon.glyphicon-ok
           tr
             td.feature-description
               span(data-i18n="subscribe.feature3")
             if !me.get('chinaVersion')
-              td 
+              td.free-cell
             td.center-ok
               span.glyphicon.glyphicon-ok
           tr
             td.feature-description
               span(data-i18n="[html]subscribe.feature4")
             if !me.get('chinaVersion')
-              td 
+              td.free-cell
             td.center-ok
               span.glyphicon.glyphicon-ok
           tr
             td.feature-description
               span(data-i18n="subscribe.feature5")
             if !me.get('chinaVersion')
-              td 
+              td.free-cell
             td.center-ok
               span.glyphicon.glyphicon-ok
           tr
             td.feature-description
               span(data-i18n="subscribe.feature6")
             if !me.get('chinaVersion')
-              td 
+              td.free-cell
+            td.center-ok
+              span.glyphicon.glyphicon-ok
+          tr
+            td.feature-description
+              span(data-i18n="[html]subscribe.feature7")
+            if !me.get('chinaVersion')
+              td.free-cell
             td.center-ok
               span.glyphicon.glyphicon-ok
       #parents-info(data-i18n="subscribe.parents")

app/templates/editor/component/add-thang-components-modal.jade

@@ -9,9 +9,9 @@ block modal-body-content
       for system in systems
         li.list-group-item
           div.item-title(data-toggle="collapse", data-target="##{system}").collapsed
-            span.glyphicon.glyphicon-chevron-down.text-muted
-            span.glyphicon.glyphicon-chevron-up.text-muted
-            a.spl= system
+            span.glyphicon.glyphicon-chevron-down.text-muted.spr
+            span.glyphicon.glyphicon-chevron-up.text-muted.spr
+            a= system
             span.spl.text-muted= nameLists[system]
           .collapse-panel.collapse(id=system)
             for component in components[system]

app/templates/i18n/i18n-home-view.jade

@@ -14,7 +14,8 @@ block content
       th Translated Name
       th Type
       th Specifically Covered
-      th Generally Covered
+      if showGeneralCoverage
+        th Generally Covered
 
     if selectedLanguage
       for model in collection.models
@@ -29,4 +30,5 @@ block content
           td= translatedName
           td= model.constructor.className
           td(class=model.specificallyCovered ? 'success' : 'danger')= model.specificallyCovered ? 'Yes' : 'No'
-          td(class=model.generallyCovered ? 'success' : 'danger')= model.generallyCovered ? 'Yes' : 'No'
+          if showGeneralCoverage
+            td(class=model.generallyCovered ? 'success' : 'danger')= model.generallyCovered ? 'Yes' : 'No'

app/templates/play/level/modal/hero-victory-modal.jade

@@ -47,7 +47,10 @@ block modal-body-content
             .reward-panel.item(data-item-thang-type=item.get('original'))
               .reward-image-container(class=animate ? 'pending-reward-image' : 'show')
                 img(src=item.getPortraitURL())
-              .reward-text= animate ? 'New Item' : item.get('name')
+              if animate
+                .reward-text(data-i18n="play_level.victory_new_item") New Item
+              else
+                .reward-text= i18n(item.attributes, 'name')
 
 block modal-footer-content
   #totals

app/templates/play/level/modal/infinite_loop.jade

@@ -1,12 +1,19 @@
 extends /templates/core/modal-base
 
 block modal-header-content
-  h3(data-i18n="play_level.infinite_loop_title") Infinite Loop Detected
+  if nonUserCodeProblem
+    h3(data-i18n="play_level.non_user_code_problem_title") Unable to Load Level
+  else
+    h3(data-i18n="play_level.infinite_loop_title") Infinite Loop Detected
 
 block modal-body-content
   .modal-body
     p(data-i18n="play_level.infinite_loop_explanation") The initial code to build the world never finished running. It's probably either really slow or has an infinite loop. Or there might be a bug. You can either try running this code again or reset the code to the default state. If that doesn't fix it, please let us know.
 
+    p
+      span.spr(data-i18n="play_level.check_dev_console") You can also open the developer console to see what might be going wrong.
+      a(href="http://webmasters.stackexchange.com/questions/8525/how-to-open-the-javascript-console-in-different-browsers/77337#77337", data-i18n="play_level.check_dev_console_instructions", target="_blank") (instructions)
+
 block modal-footer-content
   a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="play_level.infinite_loop_try_again").btn#restart-level-infinite-loop-retry-button Try Again
   a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="play_level.infinite_loop_reset_level").btn.btn-danger#restart-level-infinite-loop-confirm-button Reset Level

app/templates/play/level/modal/victory.jade

@@ -39,4 +39,4 @@ block modal-footer-content
     .g-plusone(data-href="http://codecombat.com", data-size="medium")
     .fb-like(data-href="https://www.facebook.com/codecombat", data-send="false", data-layout="button_count", data-width="350", data-show-faces="true", data-ref="coco_victory_#{fbRef}")
     a.twitter-follow-button(href="https://twitter.com/CodeCombat", data-show-count="true", data-show-screen-name="false", data-dnt="true", data-align="right", data-i18n="nav.twitter_follow") Follow
-    iframe.github-star-button(src="http://ghbtns.com/github-btn.html?user=codecombat&repo=codecombat&type=watch&count=true", allowtransparency="true", frameborder="0", scrolling="0", width="110", height="20")
+    iframe.github-star-button(src="https://ghbtns.com/github-btn.html?user=codecombat&repo=codecombat&type=watch&count=true", allowtransparency="true", frameborder="0", scrolling="0", width="110", height="20")

app/templates/play/menu/game-menu-modal.jade

@@ -6,10 +6,11 @@
       span.glyphicon.glyphicon-remove
 
     ul#game-menu-nav.nav.nav-pills.nav-stacked
-      li
-        a#change-hero-tab
-          span.glyphicon.glyphicon-user
-          span(data-i18n='[title]game_menu.choose_hero_caption;play.change_hero')
+      if showsChooseHero
+        li
+          a#change-hero-tab
+            span.glyphicon.glyphicon-user
+            span(data-i18n='[title]game_menu.choose_hero_caption;play.change_hero')
 
       for submenu, index in submenus
         li(class=submenu === showTab ? "active" : "")

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

@@ -22,16 +22,6 @@
       span(data-i18n="options.music_label") Music
     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_label") Autorun
-    select#option-autorun-delay.form-control(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
-      option(value=5000, selected=(autorunDelay === 5000), data-i18n="common.delay_5_sec") 5 seconds
-      option(value=90019001, selected=(autorunDelay === 90019001), data-i18n="common.manual") Manual
-    span.help-block(data-i18n="options.autorun_description") Control automatic code execution.
-  
-
   img.hr(src="/images/pages/play/modal/hr.png", draggable="false")
 
   h3(data-i18n="options.editor_config_title") Editor Configuration

app/templates/teachers.jade

@@ -29,6 +29,7 @@ block content
       ul
         li(data-i18n="teachers.sub_includes_2")
         li(data-i18n="teachers.sub_includes_3")
+        li(data-i18n="teachers.sub_includes_7")
         li(data-i18n="teachers.sub_includes_4")
         li(data-i18n="teachers.sub_includes_5")
         li(data-i18n="teachers.sub_includes_6")
@@ -47,6 +48,12 @@ block content
         a(href='/clans') Clans
         span.spl page.
       p After they join, you will see a summary of the student's progress on your Clan's page.
+      h4 Private Clans
+      p Private Clans provide increased privacy and detailed progress information for each student.
+      p
+        span.spr To create a private Clan, check the 'Make clan private' checkbox when creating a
+        a(href='/clans') Clan
+        span= "."
 
       h3(data-i18n="teachers.material_title")
       if me.get('chinaVersion')
@@ -107,6 +114,10 @@ block content
         span.spr.spl
           a(href='/account/subscription', data-i18n="teachers.how_much_2")
         span.spr.spl(data-i18n="teachers.how_much_3")
+      p 
+        span.spr We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact
+        a(href='mailto:team@codecombat.com') team@codecombat.com
+        span.spl for more details.
       p(data-i18n="teachers.how_much_4")
       h4
         a(href='/account/subscription', data-i18n="subscribe.group_discounts")
@@ -122,6 +133,13 @@ block content
           td(data-i18n="subscribe.group_discounts_12th")
           td(data-i18n="subscribe.group_discounts_40")
 
+      h3 Where can I find more information?
+      p
+        span Our
+        span.spr.spl
+          a(href='http://discourse.codecombat.com/c/teachers') teachers forum
+        span.spr.spl is a good place to connect with fellow educators who are using CodeCombat.
+
       h3(data-i18n="teachers.sys_requirements_title")
       p(data-i18n="teachers.sys_requirements_1")
       p(data-i18n="teachers.sys_requirements_2")

app/templates/user/identify-view.jade

@@ -0,0 +1,21 @@
+extends /templates/base
+
+block content
+
+  if callbackURL && callbackSource && callbackID
+    h3 Share your username?
+    p
+      | #{callbackSource} would like to know that you are #{me.get('name') || 'you'} on CodeCombat.
+      if me.get('anonymous')
+        br
+        button.btn.btn-lg.btn-default.header-font.login-button(data-i18n="login.log_in")
+      else if me.get('name')
+        a.spl.spr(href="#{callbackURL}") Click here
+        | to share your username.
+      else
+        | But you don't have a username yet. Set one
+        a.spl(href="/account/settings") here
+        | .
+  else
+    h3 Invalid identify URL.
+    p callbackID, callbackURL, and callbackSource are needed.

app/views/HomeView.coffee

@@ -23,7 +23,7 @@ module.exports = class HomeView extends RootView
     if $.browser
       majorVersion = $.browser.versionNumber
       c.isOldBrowser = true if $.browser.mozilla && majorVersion < 25
-      c.isOldBrowser = true if $.browser.chrome && majorVersion < 25
+      c.isOldBrowser = true if $.browser.chrome && majorVersion < 31  # Noticed Gems in the Deep not loading with 30
       c.isOldBrowser = true if $.browser.safari && majorVersion < 6  # 6 might have problems with Aether, or maybe just old minors of 6: https://errorception.com/projects/51a79585ee207206390002a2/errors/547a202e1ead63ba4e4ac9fd
     else
       console.warn 'no more jquery browser version...'
@@ -51,5 +51,5 @@ module.exports = class HomeView extends RootView
       me.set 'hourOfCode', true
       me.patch()
     # We may also insert the tracking pixel for everyone on the CampaignView so as to count directly-linked visitors.
-    $('body').append($('<img src="http://code.org/api/hour/begin_codecombat.png" style="visibility: hidden;">'))
+    $('body').append($('<img src="https://code.org/api/hour/begin_codecombat.png" style="visibility: hidden;">'))
     application.tracker?.trackEvent 'Hour of Code Begin'

app/views/admin/AnalyticsSubscriptionsView.coffee

@@ -10,7 +10,7 @@ require 'vendor/d3'
 module.exports = class AnalyticsSubscriptionsView extends RootView
   id: 'admin-analytics-subscriptions-view'
   template: template
-  targetSubCount: 2000
+  targetSubCount: 1200
 
   constructor: (options) ->
     super options
@@ -22,11 +22,13 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
   getRenderData: ->
     context = super()
     context.analytics = @analytics ? graphs: []
+    context.cancellations = @cancellations ? []
     context.subs = _.cloneDeep(@subs ? []).reverse()
     context.subscribers = @subscribers ? []
     context.subscriberCancelled = _.find context.subscribers, (subscriber) -> subscriber.cancel
+    context.subscriberSponsored = _.find context.subscribers, (subscriber) -> subscriber.user?.stripe?.sponsorID
     context.total = @total ? 0
-    context.cancelled = @cancelled ? 0
+    context.cancelled = @cancellations?.length ? @cancelled ? 0
     context.monthlyChurn = @monthlyChurn ? 0.0
     context.monthlyGrowth = @monthlyGrowth ? 0.0
     context
@@ -46,9 +48,9 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
   refreshData: ->
     return unless me.isAdmin()
     @resetSubscriptionsData()
-    @getSubscribers()
     @getCancellations (cancellations) =>
-      @getSubscriptions(cancellations)
+      @getSubscriptions cancellations, (subscriptions) =>
+        @getSubscribers(subscriptions)
 
   getCancellations: (done) ->
     options =
@@ -59,28 +61,41 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
       console.error 'Failed to get cancellations', response
     options.success = (cancellations, response, options) =>
       return if @destroyed
+      @cancellations = cancellations
+      @cancellations.sort (a, b) -> b.cancel.localeCompare(a.cancel)
+      for cancellation in @cancellations when cancellation.user?
+        cancellation.level = User.levelFromExp cancellation.user.points
       done(cancellations)
     @supermodel.addRequestResource('get_cancellations', options, 0).load()
 
-  getSubscribers: ->
+  getSubscribers: (subscriptions) ->
+    maxSubscribers = 40
+
+    subscribers = _.filter subscriptions, (a) -> a.userID?
+    subscribers.sort (a, b) -> b.start.localeCompare(a.start)
+    subscribers = subscribers.slice(0, maxSubscribers)
+    subscriberUserIDs = _.map subscribers, (a) -> a.userID
+
     options =
       url: '/db/subscription/-/subscribers'
       method: 'POST'
-      data: {maxCount: 30}
+      data: {ids: subscriberUserIDs}
     options.error = (model, response, options) =>
       return if @destroyed
       console.error 'Failed to get subscribers', response
-    options.success = (subscribers, response, options) =>
+    options.success = (userMap, response, options) =>
       return if @destroyed
-      @subscribers = subscribers
-      for subscriber in @subscribers
+      for subscriber in subscribers
+        continue unless subscriber.userID of userMap
+        subscriber.user = userMap[subscriber.userID]
         subscriber.level = User.levelFromExp subscriber.user.points
         if hero = subscriber.user.heroConfig?.thangType
           subscriber.hero = _.invert(ThangType.heroes)[hero]
+      @subscribers = subscribers
       @render?()
     @supermodel.addRequestResource('get_subscribers', options, 0).load()
 
-  getSubscriptions: (cancellations=[]) ->
+  getSubscriptions: (cancellations=[], done) ->
     options =
       url: '/db/subscription/-/subscriptions'
       method: 'GET'
@@ -101,7 +116,8 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
           subDayMap[endDay]['end'] ?= 0
           subDayMap[endDay]['end']++
         for cancellation in cancellations
-          if cancellation.subID is sub.subID
+          if cancellation.subscriptionID is sub.subscriptionID
+            sub.cancel = cancellation.cancel
             cancelDay = cancellation.cancel.substring(0, 10)
             subDayMap[cancelDay] ?= {}
             subDayMap[cancelDay]['cancel'] ?= 0
@@ -118,20 +134,21 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
           ended: subDayMap[day]['end'] or 0
 
       @subs.sort (a, b) -> a.day.localeCompare(b.day)
-      startedLastMonth = 0
+      totalLastMonth = 0
       for sub, i in @subs
         @total += sub.started
         @total -= sub.ended
         @cancelled += sub.cancelled
         sub.total = @total
-        startedLastMonth += sub.started if @subs.length - i < 31
-      @monthlyChurn = @cancelled / startedLastMonth * 100.0 if startedLastMonth > 0
+        totalLastMonth = @total if @subs.length - i is 31
+      @monthlyChurn = @cancelled / totalLastMonth * 100.0 if totalLastMonth > 0
       if @subs.length > 30 and @subs[@subs.length - 31].total > 0
         startMonthTotal = @subs[@subs.length - 31].total
         endMonthTotal = @subs[@subs.length - 1].total
         @monthlyGrowth = (endMonthTotal / startMonthTotal - 1) * 100
       @updateAnalyticsGraphData()
       @render?()
+      done(subs)
     @supermodel.addRequestResource('get_subscriptions', options, 0).load()
 
   updateAnalyticsGraphData: ->
@@ -170,7 +187,7 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
       color: 'red'
       strokeWidth: 1
     lineMetadata[netSubsID] =
-      description: '7-day Average Net Subscriptions'
+      description: '7-day Average Net Subscriptions (started - ended)'
       color: 'black'
       strokeWidth: 4
 

app/views/clans/ClanDetailsView.coffee

@@ -1,26 +1,36 @@
-app = require 'core/application'
-AuthModal = require 'views/core/AuthModal'
 RootView = require 'views/core/RootView'
 template = require 'templates/clans/clan-details'
+app = require 'core/application'
+AuthModal = require 'views/core/AuthModal'
 CocoCollection = require 'collections/CocoCollection'
+Campaign = require 'models/Campaign'
 Clan = require 'models/Clan'
 EarnedAchievement = require 'models/EarnedAchievement'
 LevelSession = require 'models/LevelSession'
+SubscribeModal = require 'views/core/SubscribeModal'
 ThangType = require 'models/ThangType'
 User = require 'models/User'
 
-# TODO: Message for clan not found
-# TODO: join/leave mostly duped from clans view
+# TODO: Add message for clan not found
+# TODO: Progress visual for premium levels?
+# TODO: Add expanded level names toggle
+# TODO: Only need campaign data if clan is private
 
 module.exports = class ClanDetailsView extends RootView
   id: 'clan-details-view'
   template: template
 
   events:
+    'change .expand-progress-checkbox': 'onExpandedProgressCheckbox'
     'click .delete-clan-btn': 'onDeleteClan'
+    'click .edit-description-save-btn': 'onEditDescriptionSave'
+    'click .edit-name-save-btn': 'onEditNameSave'
     'click .join-clan-btn': 'onJoinClan'
     'click .leave-clan-btn': 'onLeaveClan'
+    'click .progress-level-cell': 'onClickLevel'
     'click .remove-member-btn': 'onRemoveMember'
+    'mouseenter .progress-level-cell': 'onMouseEnterPoint'
+    'mouseleave .progress-level-cell': 'onMouseLeavePoint'
 
   constructor: (options, @clanID) ->
     super options
@@ -30,20 +40,24 @@ module.exports = class ClanDetailsView extends RootView
     @stopListening?()
 
   initData: ->
+    @showExpandedProgress = false
     @stats = {}
 
+    @campaigns = new CocoCollection([], { url: "/db/campaign", model: Campaign, comparator:'_id' })
     @clan = new Clan _id: @clanID
-    @members = new CocoCollection([], { url: "/db/clan/#{@clanID}/members", model: User, comparator:'slug' })
+    @members = new CocoCollection([], { url: "/db/clan/#{@clanID}/members", model: User, comparator: 'nameLower' })
     @memberAchievements = new CocoCollection([], { url: "/db/clan/#{@clanID}/member_achievements", model: EarnedAchievement, comparator:'_id' })
     # MemberSessions: only loads creatorName, levelName, codeLanguage, submittedCodeLanguage for each session
     @memberSessions = new CocoCollection([], { url: "/db/clan/#{@clanID}/member_sessions", model: LevelSession, comparator:'_id' })
 
     @listenTo me, 'sync', => @render?()
+    @listenTo @campaigns, 'sync', @onCampaignSync
     @listenTo @clan, 'sync', @onClanSync
     @listenTo @members, 'sync', @onMembersSync
     @listenTo @memberAchievements, 'sync', @onMemberAchievementsSync
     @listenTo @memberSessions, 'sync', @onMemberSessionsSync
 
+    @supermodel.loadModel @campaigns, 'clan', cache: false
     @supermodel.loadModel @clan, 'clan', cache: false
     @supermodel.loadCollection(@members, 'members', {cache: false})
     @supermodel.loadCollection(@memberAchievements, 'member_achievements', {cache: false})
@@ -51,6 +65,7 @@ module.exports = class ClanDetailsView extends RootView
 
   getRenderData: ->
     context = super()
+    context.campaignLevelProgressions = @campaignLevelProgressions ? []
     context.clan = @clan
     if application.isProduction()
       context.joinClanLink = "https://codecombat.com/clans/#{@clanID}"
@@ -59,10 +74,34 @@ module.exports = class ClanDetailsView extends RootView
     context.owner = @owner
     context.memberAchievementsMap = @memberAchievementsMap
     context.memberLanguageMap = @memberLanguageMap
+    context.memberLevelStateMap = @memberLevelMap ? {}
+    context.memberMaxLevelCount = @memberMaxLevelCount
     context.members = @members?.models
     context.isOwner = @clan.get('ownerID') is me.id
     context.isMember = @clanID in (me.get('clans') ? [])
     context.stats = @stats
+
+    # Find last campaign level for each user
+    lastUserCampaignLevelMap = {}
+    maxLastUserCampaignLevel = 0
+    if @campaigns.loaded
+      for campaign in @campaigns.models
+        campaignID = campaign.id
+        lastLevelIndex = 0
+        for levelID, level of campaign.get('levels')
+          levelSlug = level.slug
+          for member in context.members
+            if context.memberLevelStateMap[member.id]?[levelSlug]
+              lastUserCampaignLevelMap[member.id] ?= {}
+              lastUserCampaignLevelMap[member.id][campaignID] ?= {}
+              lastUserCampaignLevelMap[member.id][campaignID] =
+                levelSlug: levelSlug
+                index: lastLevelIndex
+              maxLastUserCampaignLevel = lastLevelIndex if lastLevelIndex > maxLastUserCampaignLevel
+          lastLevelIndex++
+
+    context.lastUserCampaignLevelMap = lastUserCampaignLevelMap
+    context.showExpandedProgress = maxLastUserCampaignLevel <= 30 or @showExpandedProgress
     context
 
   afterRender: ->
@@ -73,6 +112,7 @@ module.exports = class ClanDetailsView extends RootView
     me.fetch cache: false
     @members.fetch cache: false
     @memberAchievements.fetch cache: false
+    @memberSessions.fetch cache: false
 
   updateHeroIcons: ->
     return unless @members?.models?
@@ -81,6 +121,31 @@ module.exports = class ClanDetailsView extends RootView
       for slug, original of ThangType.heroes when original is hero
         @$el.find(".player-hero-icon[data-memberID=#{member.id}]").removeClass('.player-hero-icon').addClass('player-hero-icon ' + slug)
 
+  onCampaignSync: ->
+    return unless @campaigns.loaded
+    @campaignLevelProgressions = []
+    for campaign in @campaigns.models
+      continue if campaign.get('slug') is 'auditions'
+      campaignLevelProgression =
+        ID: campaign.id
+        slug: campaign.get('slug')
+        name: campaign.get('name')
+        levels: []
+      # TODO: Where do these proper names come from?
+      campaignLevelProgression.name = switch
+        when campaignLevelProgression.slug is 'dungeon' then 'Kithgard Dungeon'
+        when campaignLevelProgression.slug is 'forest' then 'Backwoods Forest'
+        when campaignLevelProgression.slug is 'desert' then 'Sarven Desert'
+        when campaignLevelProgression.slug is 'mountain' then 'Cloudrip Mountain'
+        else campaignLevelProgression.name
+      for levelID, level of campaign.get('levels')
+        campaignLevelProgression.levels.push
+          ID: levelID
+          slug: level.slug
+          name: level.name
+      @campaignLevelProgressions.push campaignLevelProgression
+    @render?()
+
   onClanSync: ->
     unless @owner?
       @owner = new User _id: @clan.get('ownerID')
@@ -93,7 +158,6 @@ module.exports = class ClanDetailsView extends RootView
     @render?()
 
   onMemberAchievementsSync: ->
-    @stats.totalAchievements = @memberAchievements.models.length
     @memberAchievementsMap = {}
     for achievement in @memberAchievements.models
       user = achievement.get('user')
@@ -101,20 +165,39 @@ module.exports = class ClanDetailsView extends RootView
       @memberAchievementsMap[user].push achievement
     for user of @memberAchievementsMap
       @memberAchievementsMap[user].sort (a, b) -> b.id.localeCompare(a.id)
+    @stats.averageAchievements = Math.round(@memberAchievements.models.length / Object.keys(@memberAchievementsMap).length)
     @render?()
 
   onMemberSessionsSync: ->
-    @memberSessionMap = {}
+    @memberLevelMap = {}
+    memberSessions = {}
     for levelSession in @memberSessions.models
+      continue if levelSession.isMultiplayer()
       user = levelSession.get('creator')
-      @memberSessionMap[user] ?= []
-      @memberSessionMap[user].push levelSession
+      levelSlug = levelSession.get('levelID')
+      @memberLevelMap[user] ?= {}
+      @memberLevelMap[user][levelSlug] ?= {}
+      levelInfo =
+        level: levelSession.get('levelName')
+        levelID: levelSession.get('levelID')
+        changed: new Date(levelSession.get('changed')).toLocaleString()
+        playtime: levelSession.get('playtime')
+        sessionID: levelSession.id
+      @memberLevelMap[user][levelSlug].levelInfo = levelInfo
+      if levelSession.get('state')?.complete is true
+        @memberLevelMap[user][levelSlug].state = 'complete'
+        memberSessions[user] ?= []
+        memberSessions[user].push levelSession
+      else
+        @memberLevelMap[user][levelSlug].state = 'started'
+    @memberMaxLevelCount = 0
     @memberLanguageMap = {}
-    for user of @memberSessionMap
+    for user of memberSessions
       languageCounts = {}
-      for levelSession in @memberSessionMap[user]
+      for levelSession in memberSessions[user]
         language = levelSession.get('codeLanguage') or levelSession.get('submittedCodeLanguage')
         languageCounts[language] = (languageCounts[language] or 0) + 1 if language
+      @memberMaxLevelCount = memberSessions[user].length if @memberMaxLevelCount < memberSessions[user].length
       mostUsedCount = 0
       for language, count of languageCounts
         if count > mostUsedCount
@@ -122,8 +205,28 @@ module.exports = class ClanDetailsView extends RootView
           @memberLanguageMap[user] = language
     @render?()
 
+  onMouseEnterPoint: (e) ->
+    $('.level-popup-container').hide()
+    container = $(e.target).find('.level-popup-container').show()
+    margin = 20
+    offset = $(e.target).offset()
+    scrollTop = $(e.target).offsetParent().scrollTop()
+    height = container.outerHeight()
+    container.css('left', offset.left + e.offsetX)
+    container.css('top', offset.top + scrollTop - height - margin)
+
+  onMouseLeavePoint: (e) ->
+    $(e.target).find('.level-popup-container').hide()
+
+  onClickLevel: (e) ->
+    levelInfo = $(e.target).data 'level-info'
+    return unless levelInfo?.levelID? and levelInfo?.sessionID?
+    url = "/play/level/#{levelInfo.levelID}?session=#{levelInfo.sessionID}&observing=true"
+    window.open url, '_blank'
+
   onDeleteClan: (e) ->
     return @openModalView(new AuthModal()) if me.isAnonymous()
+    return unless window.confirm("Delete Clan?")
     options =
       url: "/db/clan/#{@clanID}"
       method: 'DELETE'
@@ -134,8 +237,31 @@ module.exports = class ClanDetailsView extends RootView
         window.location.reload()
     @supermodel.addRequestResource( 'delete_clan', options).load()
 
+  onEditDescriptionSave: (e) ->
+    description = $('.edit-description-input').val()
+    @clan.set 'description', description
+    @clan.patch()
+    $('#editDescriptionModal').modal('hide')
+
+  onEditNameSave: (e) ->
+    if name = $('.edit-name-input').val()
+      @clan.set 'name', name
+      @clan.patch()
+    $('#editNameModal').modal('hide')
+
+  onExpandedProgressCheckbox: (e) ->
+    @showExpandedProgress = $('.expand-progress-checkbox').prop('checked')
+    # TODO: why does render reset the checkbox to be unchecked?
+    @render?()
+    $('.expand-progress-checkbox').attr('checked', @showExpandedProgress)
+
   onJoinClan: (e) ->
     return @openModalView(new AuthModal()) if me.isAnonymous()
+    return unless @clan.loaded
+    if @clan.get('type') is 'private' and not me.isPremium()
+      @openModalView new SubscribeModal()
+      window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'join clan'
+      return
     options =
       url: "/db/clan/#{@clanID}/join"
       method: 'PUT'
@@ -154,6 +280,7 @@ module.exports = class ClanDetailsView extends RootView
     @supermodel.addRequestResource( 'leave_clan', options).load()
 
   onRemoveMember: (e) ->
+    return unless window.confirm("Remove Hero?")
     if memberID = $(e.target).data('id')
       options =
         url: "/db/clan/#{@clanID}/remove/#{memberID}"

app/views/clans/ClansView.coffee

@@ -4,6 +4,7 @@ RootView = require 'views/core/RootView'
 template = require 'templates/clans/clans'
 CocoCollection = require 'collections/CocoCollection'
 Clan = require 'models/Clan'
+SubscribeModal = require 'views/core/SubscribeModal'
 
 # TODO: Waiting for async messages
 # TODO: Invalid clan name message
@@ -17,6 +18,7 @@ module.exports = class MainAdminView extends RootView
     'click .create-clan-btn': 'onClickCreateClan'
     'click .join-clan-btn': 'onJoinClan'
     'click .leave-clan-btn': 'onLeaveClan'
+    'click .private-clan-checkbox': 'onClickPrivateCheckbox'
 
   constructor: (options) ->
     super options
@@ -28,11 +30,15 @@ module.exports = class MainAdminView extends RootView
   getRenderData: ->
     context = super()
     context.idNameMap = @idNameMap
-    context.publicClans = @publicClans.models
+    context.publicClans = _.filter(@publicClans.models, (clan) -> clan.get('type') is 'public')
     context.myClans = @myClans.models
     context.myClanIDs = me.get('clans') ? []
     context
 
+  afterRender: ->
+    super()
+    @setupPrivateInfoPopover()
+
   initData: ->
     @idNameMap = {}
 
@@ -54,20 +60,42 @@ module.exports = class MainAdminView extends RootView
     @listenTo me, 'sync', => @render?()
 
   refreshNames: (clans) ->
+    clanIDs = _.filter(clans, (clan) -> clan.get('type') is 'public')
+    clanIDs = _.map(clans, (clan) -> clan.get('ownerID'))
     options =
       url: '/db/user/-/names'
       method: 'POST'
-      data: {ids: _.map(clans, (clan) -> clan.get('ownerID'))}
+      data: {ids: clanIDs}
       success: (models, response, options) =>
         @idNameMap[userID] = models[userID].name for userID of models
         @render?()
     @supermodel.addRequestResource('user_names', options, 0).load()
 
+  setupPrivateInfoPopover: ->
+    popoverTitle = "<h3>Private Clans</h3>"
+    popoverContent = "<p>Invite only</p>"
+    popoverContent += "<p>Detailed dashboard:</p>"
+    popoverContent += "<p><img src='/images/pages/clans/dashboard_preview.png' width='700'></p>"
+    @$el.find('.private-more-info').popover(
+      animation: true
+      html: true
+      placement: 'right'
+      trigger: 'hover'
+      title: popoverTitle
+      content: popoverContent
+      container: @$el
+    )
+
   onClickCreateClan: (e) ->
-    return @openModalView(new AuthModal()) if me.isAnonymous()
+    return @openModalView new AuthModal() if me.isAnonymous()
+    clanType = if $('.private-clan-checkbox').prop('checked') then 'private' else 'public'
+    if clanType is 'private' and not me.isPremium()
+      @openModalView new SubscribeModal()
+      window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'create clan'
+      return
     if name = $('.create-clan-name').val()
       clan = new Clan()
-      clan.set 'type', 'public'
+      clan.set 'type', clanType
       clan.set 'name', name
       clan.set 'description', description if description = $('.create-clan-description').val()
       clan.save {},
@@ -108,3 +136,10 @@ module.exports = class MainAdminView extends RootView
       @supermodel.addRequestResource( 'leave_clan', options).load()
     else
       console.error "No clan ID attached to leave button."
+
+  onClickPrivateCheckbox: (e) ->
+    return @openModalView new AuthModal() if me.isAnonymous()
+    if $('.private-clan-checkbox').prop('checked') and not me.isPremium()
+      $('.private-clan-checkbox').attr('checked', false)
+      @openModalView new SubscribeModal()
+      window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'check private clan'

app/views/contribute/DiplomatView.coffee

@@ -113,7 +113,7 @@ module.exports = class DiplomatView extends ContributeClassView
     'nl-NL': ['Guido Zuidhof', "Jasper D\'haene"]        # Nederlands (Nederland), Dutch (Netherlands)
     fa: ['Reza Habibi (Rehb)']             # فارسی, Persian
     cs: ['Martin005', 'Gygram', 'vanous']             # čeština, Czech
-    sv: ['iamhj']             # Svenska, Swedish
+    sv: ['iamhj', 'Galaky']             # Svenska, Swedish
     id: ['mlewisno-oberlin']             # Bahasa Indonesia, Indonesian
     el: ['Stergios']             # ελληνικά, Greek
     ro: []             # limba română, Romanian

app/views/i18n/I18NHomeView.coffee

@@ -73,6 +73,7 @@ module.exports = class I18NHomeView extends RootView
     covered = (m for m in @aggregateModels.models when m.specificallyCovered).length
     total = @aggregateModels.models.length
     c.progress = if total then parseInt(100 * covered / total) else 100
+    c.showGeneralCoverage = /-/.test(@selectedLanguage ? 'en')  # Only relevant for languages with more than one family, like zh-HANS
 
     c
 

app/views/ladder/LadderPlayModal.coffee

@@ -37,6 +37,9 @@ module.exports = class LadderPlayModal extends ModalView
     aceConfig.language = @$el.find('#tome-language').val()
     me.set 'aceConfig', aceConfig
     me.patch()
+    if @session
+      @session.set 'codeLanguage', aceConfig.language
+      @session.patch()
 
   # PART 1: Load challengers from the db unless some are in the matches
   startLoadingChallengersMaybe: ->
@@ -88,6 +91,7 @@ module.exports = class LadderPlayModal extends ModalView
     ctx.teamID = @team
     ctx.otherTeamID = @otherTeam
     ctx.tutorialLevelExists = @tutorialLevelExists
+    ctx.language = @session?.get('codeLanguage') ? me.get('aceConfig')?.language ? 'python'
     ctx.languages = [
       {id: 'python', name: 'Python'}
       {id: 'javascript', name: 'JavaScript'}

app/views/play/CampaignView.coffee

@@ -108,7 +108,7 @@ module.exports = class CampaignView extends RootView
     # If it's a new player who didn't appear to come from Hour of Code, we register her here without setting the hourOfCode property.
     elapsed = (new Date() - new Date(me.get('dateCreated')))
     if not trackedHourOfCode and not me.get('hourOfCode') and elapsed < 5 * 60 * 1000
-      $('body').append($('<img src="http://code.org/api/hour/begin_codecombat.png" style="visibility: hidden;">'))
+      $('body').append($('<img src="https://code.org/api/hour/begin_codecombat.png" style="visibility: hidden;">'))
       trackedHourOfCode = true
 
     @requiresSubscription = not me.isPremium()
@@ -302,7 +302,7 @@ module.exports = class CampaignView extends RootView
       unless foundNext
         for nextLevelOriginal in level.nextLevels
           nextLevel = _.find levels, original: nextLevelOriginal
-          if nextLevel and not nextLevel.locked and @levelStatusMap[nextLevel.slug] isnt 'complete' and (
+          if nextLevel and not nextLevel.locked and @levelStatusMap[nextLevel.slug] isnt 'complete' and nextLevel.slug isnt 'lost-viking' and not nextLevel.replayable and (
             me.isPremium() or
             not nextLevel.requiresSubscription or
             nextLevel.slug is 'apocalypse' or

app/views/play/level/LevelHUDView.coffee

@@ -101,7 +101,7 @@ module.exports = class LevelHUDView extends CocoView
 
   createProperties: ->
     if @thang.id in ['Hero Placeholder', 'Hero Placeholder 1']
-      name = {knight: 'Tharin', captain: 'Anya', librarian: 'Hushbaum', sorcerer: 'Pender', 'potion-master': 'Omarn', samurai: 'Hattori', ninja: 'Amara'}[@thang.type] ? 'Hero'
+      name = {knight: 'Tharin', captain: 'Anya', librarian: 'Hushbaum', sorcerer: 'Pender', 'potion-master': 'Omarn', samurai: 'Hattori', ninja: 'Amara', raider: 'Arryn', goliath: 'Okar', guardian: 'Illia', pixie: 'Zana', assassin: 'Ritic', necromancer: 'Nalfar', 'dark-wizard': 'Usara'}[@thang.type] ? 'Hero'
     else
       name = @thang.hudName or (if @thang.type then "#{@thang.id} - #{@thang.type}" else @thang.id)
     utils.replaceText @$el.find('.thang-name'), name