Merge branch 'master' into production

app/locale/cs.coffee

@@ -107,8 +107,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     load_profile: "Načíst Google+ Profil"
     load_email: "Načíst Google+ Email"
     finishing: "Dokončování"
-    sign_in_with_facebook: "Přihlásit se přes Facebook"
-    sign_in_with_gplus: "Přihlásit se přes Google+"
+    sign_in_with_facebook: "Přihlásit přes Facebook"
+    sign_in_with_gplus: "Přihlásit přes Google+"
     signup_switch: "Chcete si založit účet?"
 
   signup:
@@ -144,7 +144,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     create: "Vytvořit"
     manual: "Ručně"
     fork: "Klonovat"
-    play: "Přehrát" # When used as an action verb, like "Play next level"
+    play: "Hrát" # When used as an action verb, like "Play next level"
     retry: "Znovu"
     actions: "Akce"
     info: "Info"
@@ -409,22 +409,22 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    returns: "Returns"
 #    granted_by: "Granted by"
 
-#  save_load:
-#    granularity_saved_games: "Saved"
-#    granularity_change_history: "History"
+  save_load:
+    granularity_saved_games: "Uložené"
+    granularity_change_history: "Historie"
 
-#  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"
+  options:
+    general_options: "Obecné nastavení" # Check out the Options tab in the Game Menu while playing a level
+    volume_label: "Hlasitost"
+    music_label: "Hudba"
+    music_description: "Vypnout/zapnout hudbu v pozadí."
+    autorun_label: "Autospuštění"
 #    autorun_description: "Control automatic code execution."
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
-#    editor_config_level_language_label: "Language for This Level"
+    editor_config_level_language_label: "Jazyky pro tuto úroveň"
 #    editor_config_level_language_description: "Define the programming language for this particular level."
-#    editor_config_default_language_label: "Default Programming Language"
+    editor_config_default_language_label: "Výchozí programovací jazyk"
 #    editor_config_default_language_description: "Define the programming language you want to code in when starting new levels."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
@@ -447,21 +447,21 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     why_paragraph_2_italic_caps: "POČKEJ MAMI, MUSÍM DOKONČIT ÚROVEŇ!"
     why_paragraph_2_suffix: "Proto je CodeCombat opravdová multiplayer hra, ne lekce kurzu s herními odznáčky. Neskončí, dokud sami nepřestanete, což je tentokrát dobrá věc."
     why_paragraph_3: "A jestli se máte stát závislými na nějaké hře, pak ať je to hra tato, a staňte se díky tomu kouzelníky a odborníky v této technické době."
-#    press_title: "Bloggers/Press"
+    press_title: "Blogeři/Tisk"
 #    press_paragraph_1_prefix: "Want to write about us? Feel free to download and use all of the resources included in our"
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
-#    team: "Team"
-#    george_title: "CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Programmer"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Programmer"
-#    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
-#    matt_blurb: "Bicyclist"
+    team: "Tým"
+    george_title: "Výkonný ředitel"
+    george_blurb: "Obchodník"
+    scott_title: "Programátor"
+    scott_blurb: "Ten potřebný"
+    nick_title: "Programátor"
+    nick_blurb: "Motivační guru"
+    michael_title: "Programátor"
+    michael_blurb: "Systémový administrátor"
+    matt_title: "Programátor"
+    matt_blurb: "Cyklista"
 
   versions:
     save_version_title: "Uložit novou verzi"

app/locale/pt-BR.coffee

@@ -146,13 +146,13 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     fork: "Fork"
     play: "Jogar" # When used as an action verb, like "Play next level"
     retry: "Tente novamente"
-#    actions: "Actions"
-#    info: "Info"
-#    help: "Help"
+    actions: "Ações"
+    info: "Info"
+    help: "Ajuda"
     watch: "Observar"
     unwatch: "Não Observar"
     submit_patch: "Enviar arranjo"
-#    submit_changes: "Submit Changes"
+    submit_changes: "Enviar mudanças"
 
   general:
     and: "e"
@@ -161,14 +161,14 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     body: "Principal"
     version: "Versão"
 #    submitter: "Submitter"
-#    submitted: "Submitted"
+    submitted: "Enviado"
     commit_msg: "Mensagem de Submissão"
-#    review: "Review"
+    review: "Revisão"
     version_history: "Histórico de Versão"
     version_history_for: "Histórico de Versão para: "
-#    select_changes: "Select two changes below to see the difference."
-#    undo: "Undo (Ctrl+Z)"
-#    redo: "Redo (Ctrl+Shift+Z)"
+    select_changes: "Selecione duas alterações para ver as diferenças."
+    undo: "Desfazer (Ctrl+Z)"
+    redo: "Refazer (Ctrl+Shift+Z)"
 #    play_preview: "Play preview of current level"
     result: "Resultado"
     results: "Resultados"
@@ -344,7 +344,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     prompt_title: "Gemas insulficientes"
     prompt_body: "Você quer conseguir mais gemas?"
     prompt_button: "Entrar na loja"
-#    recovered: "Previous gems purchase recovered. Please refresh the page."
+    recovered: "Gems de compras anteriores Recuperadas. Por favor atualize a pagina."
 
   subscribe:
     subscribe_title: "Inscrever-se"
@@ -395,7 +395,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     writable: "gravável" # Hover over "attack" in Your Skills while playing a level to see most of this
     read_only: "apenas leitura"
     action_name: "nome"
-#    action_cooldown: "Takes"
+    action_cooldown: "Demora"
     action_specific_cooldown: "Recarregando"
     action_damage: "Dano"
     action_range: "Distância"

server/commons/mapping.coffee

@@ -1,5 +1,6 @@
 module.exports.handlers =
-  'analytics_log_event': 'analytics/analytics_log_event_handler'
+  # TODO: Disabling this until we know why our app servers CPU grows out of control.
+  # 'analytics_log_event': 'analytics/analytics_log_event_handler'
   'analytics_users_active': 'analytics/analytics_users_active_handler'
   'article': 'articles/article_handler'
   'level': 'levels/level_handler'