Merge pull request #363 from codecombat/master

Merge master into production

app/locale/pt-BR.coffee

@@ -31,21 +31,21 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     about: "Sobre"
     contact: "Contate-nos"
     twitter_follow: "Seguir"
-#    employers: "Employers"
+    employers: "Empregadores"
 
-#  versions:
+  versions:
-#    save_version_title: "Save New Version"
+    save_version_title: "Salvar nova versão"
-#    new_major_version: "New Major Version"
+    new_major_version: "Nova versão principal"
-#    cla_prefix: "To save changes, first you must agree to our"
+    cla_prefix: "Para salvar as modificações, primeiro você deve concordar com nosso"
-#    cla_url: "CLA"
+    cla_url: "CLA"
-#    cla_suffix: "."
+    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_agree: "EU CONCORDO"
 
   login:
     sign_up: "Criar conta"
     log_in: "Entrar"
     log_out: "Sair"
-    recover: "recuperar sua conta"
+    recover: "Recuperar sua conta"
 
   recover:
     recover_account_title: "Recuperar conta"
@@ -122,7 +122,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     new_password_verify: "Confirmação"
     email_subscriptions: "Assinaturas para Notícias por Email"
     email_announcements: "Notícias"
-#    email_notifications_description: "Get periodic notifications for your account."
+    email_notifications_description: "Recebe notificações periódicas em sua conta."
     email_announcements_description: "Receba emails com as últimas notícias e desenvolvimentos do CodeCombat."
     contributor_emails: "Emails para as Classes de Contribuidores"
     contribute_prefix: "Estamos procurando pessoas para se juntar à nossa turma! Confira a nossa "
@@ -191,75 +191,75 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     tome_select_a_thang: "Selecione alguém para "
     tome_available_spells: "Feitiços Disponíveis"
     hud_continue: "Continue (tecle Shift+Space)"
-#    spell_saved: "Spell Saved"
+    spell_saved: "Feitiço Salvo"
 
-#  admin:
+  admin:
-#    av_title: "Admin Views"
+    av_title: "Visualização de Administrador"
-#    av_entities_sub_title: "Entities"
+    av_entities_sub_title: "Entidades"
-#    av_entities_users_url: "Users"
+    av_entities_users_url: "Usuários"
-#    av_entities_active_instances_url: "Active Instances"
+    av_entities_active_instances_url: "Instâncias Ativas"
-#    av_other_sub_title: "Other"
+    av_other_sub_title: "Outro"
-#    av_other_debug_base_url: "Base (for debugging base.jade)"
+    av_other_debug_base_url: "Base (para debugar base.jade)"
-#    u_title: "User List"
+    u_title: "Lista de Usuários"
-#    lg_title: "Latest Games"
+    lg_title: "Últimos Jogos"
 
-#  editor:
+  editor:
-#    main_title: "CodeCombat Editors"
+    main_title: "Editores do CodeCombat"
-#    main_description: "Build your own levels, campaigns, units and educational content. We provide all the tools you need!"
+    main_description: "Construa seus próprios níveis, campanhas, unidades e conteúdo educacional. Nós fornecemos todas as ferramentas que você precisa!"
-#    article_title: "Article Editor"
+    article_title: "Editor de Artigo"
-#    article_description: "Write articles that give players overviews of programming concepts which can be used across a variety of levels and campaigns."
+    article_description: "Escreva artigos que forneçam aos jogadores explicações sobre conceitos de programação que podem ser utilizados em diversos níveis e campanhas."
-#    thang_title: "Thang Editor"
+    thang_title: "Editor de Thang"
-#    thang_description: "Build units, defining their default logic, graphics and audio. Currently only supports importing Flash exported vector graphics."
+    thang_description: "Construa unidades, definindo sua lógica padrão, gráfico e áudio. Atualmente só é suportado importação de vetores gráficos exportados do Flash."
-#    level_title: "Level Editor"
+    level_title: "Editor de Niível"
-#    level_description: "Includes the tools for scripting, uploading audio, and constructing custom logic to create all sorts of levels. Everything we use ourselves!"
+    level_description: "Inclui as ferramentas para codificar, fazer o upload de áudio e construir uma lógica diferente para criar todos os tipos de níveis. Tudo o que nós mesmos utilizamos!"
-#    security_notice: "Many major features in these editors are not currently enabled by default. As we improve the security of these systems, they will be made generally available. If you'd like to use these features sooner, "
+    security_notice: "Muitos recursos principais nestes editores não estão habilitados por padrão atualmente. A maneira que melhoramos a segurança desses sistemas, eles serão colocados a disposição. Se você quiser utilizar um desses recursos mais rápido, "
-#    contact_us: "contact us!"
+    contact_us: "entre em contato!"
-#    hipchat_prefix: "You can also find us in our"
+    hipchat_prefix: "Você também pode nos encontrar na nossa"
-#    hipchat_url: "HipChat room."
+    hipchat_url: "Sala do HipChat."
-#    level_some_options: "Some Options?"
+    level_some_options: "Algumas  Opções?"
-#    level_tab_thangs: "Thangs"
+    level_tab_thangs: "Thangs"
-#    level_tab_scripts: "Scripts"
+    level_tab_scripts: "Scripts"
-#    level_tab_settings: "Settings"
+    level_tab_settings: "Configurações"
-#    level_tab_components: "Components"
+    level_tab_components: "Componentes"
-#    level_tab_systems: "Systems"
+    level_tab_systems: "Sistemas"
-#    level_tab_thangs_title: "Current Thangs"
+    level_tab_thangs_title: "Thangs Atuais"
-#    level_tab_thangs_conditions: "Starting Conditions"
+    level_tab_thangs_conditions: "Condições de Início"
-#    level_tab_thangs_add: "Add Thangs"
+    level_tab_thangs_add: "Adicionar Thangs"
-#    level_settings_title: "Settings"
+    level_settings_title: "Configurações"
-#    level_component_tab_title: "Current Components"
+    level_component_tab_title: "Componentess Atuais"
-#    level_component_btn_new: "Create New Component"
+    level_component_btn_new: "Criar Novo Componente"
-#    level_systems_tab_title: "Current Systems"
+    level_systems_tab_title: "Sistemas Atuais"
-#    level_systems_btn_new: "Create New System"
+    level_systems_btn_new: "Criar Novo Sistema"
-#    level_systems_btn_add: "Add System"
+    level_systems_btn_add: "Adicionar Sistema"
-#    level_components_title: "Back to All Thangs"
+    level_components_title: "Voltar para Lista de Thangs"
-#    level_components_type: "Type"
+    level_components_type: "Tipo"
-#    level_component_edit_title: "Edit Component"
+    level_component_edit_title: "Editar Componente"
-#    level_system_edit_title: "Edit System"
+    level_system_edit_title: "Editar Sistema"
-#    create_system_title: "Create New System"
+    create_system_title: "Criar Novo Sistema"
-#    new_component_title: "Create New Component"
+    new_component_title: "Criar Novo Componente"
-#    new_component_field_system: "System"
+    new_component_field_system: "Sistema"
 
-#  article:
+  article:
-#    edit_btn_preview: "Preview"
+    edit_btn_preview: "Prever"
-#    edit_article_title: "Edit Article"
+    edit_article_title: "Editar Artigo "
 
   general:
-#    and: "and"
+    and: "e"
     or: "ou"
     name: "Nome"
 #    body: "Body"
-#    version: "Version"
+    version: "Versão"
-#    commit_msg: "Commit Message"
+    commit_msg: "Mensagem do Commit"
-#    version_history_for: "Version History for: "
+    version_history_for: "Histórico de Versão para: "
-#    results: "Results"
+    results: "Resultados"
-#    description: "Description"
+    description: "Descrição"
     email: "Email"
     message: "Mensagem"
 
-#  about:
+  about:
-#    who_is_codecombat: "Who is CodeCombat?"
+    who_is_codecombat: "Quem é CodeCombat?"
-#    why_codecombat: "Why CodeCombat?"
+    why_codecombat: "Por que CodeCombat?"
-#    who_description_prefix: "together started CodeCombat in 2013. We also created "
+    who_description_prefix: "juntos começamos o CodeCombat em 2013. Noós também criamos "
 #    who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters."
 #    who_description_ending: "Now it's time to teach people to write code."
 #    why_paragraph_1: "When making Skritter, George didn't know how to program and was constantly frustrated by his inability to implement his ideas. Afterwards, he tried learning, but the lessons were too slow. His housemate, wanting to reskill and stop teaching, tried Codecademy, but \"got bored.\" Each week another friend started Codecademy, then dropped off. We realized it was the same problem we'd solved with Skritter: people learning a skill via slow, intensive lessons when what they need is fast, extensive practice. We know how to fix that."

app/locale/zh-HANS.coffee

@@ -1,8 +1,8 @@
 module.exports = nativeDescription: "简体中文", englishDescription: "Chinese (Simplified)", translation:
   common:
-    loading: "读取中..."
+    loading: "读取中……"
     saving: "保存中……"
-    sending: "发送中..."
+    sending: "发送中……"
     cancel: "退出"
 #    save: "Save"
     delay_1_sec: "1 秒"
@@ -53,33 +53,33 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 
   signup:
 #    create_account_title: "Create Account to Save Progress"
-    description: "这是免费的。简单易学："
+    description: "这是免费的，简单易学："
     email_announcements: "通过邮件接收通知"
-    coppa: "13 岁以上或非美国用户"
+    coppa: "13岁以上或非美国用户"
     coppa_why: "为什么？"
-    creating: "账户创建中..."
+    creating: "账户创建中……"
     sign_up: "注册"
     log_in: "登录"
 
   home:
     slogan: "通过玩儿游戏学到Javascript脚本语言"
-    no_ie: "抱歉！Internet Explorer 9等更旧的预览器打不开此网站"
+    no_ie: "抱歉！Internet Explorer 9等更旧的预览器打不开此网站。"
     no_mobile: "CodeCombat 不是针对手机设备设计的，所以可能不好用！"
     play: "玩"
 
   play:
     choose_your_level: "选取难度"
-    adventurer_prefix: "你可以选择以下任意关卡，或者讨论以上的关卡 "
+    adventurer_prefix: "你可以选择以下任意关卡，或者讨论以上的关卡。"
-    adventurer_forum: "冒险家论坛"
+    adventurer_forum: "冒险者论坛"
     adventurer_suffix: "."
     campaign_beginner: "新手作战"
-    campaign_beginner_description: "...在这里可以学到编程技巧。"
+    campaign_beginner_description: "……在这里可以学到编程技巧。"
     campaign_dev: "随机困难关卡"
-    campaign_dev_description: "...在这里你可以学到做一些复杂功能的接口。"
+    campaign_dev_description: "……在这里你可以学到做一些复杂功能的接口。"
     campaign_multiplayer: "多人竞技场"
-    campaign_multiplayer_description: "...在这里你可以和其他玩家们进行代码肉搏战。"
+    campaign_multiplayer_description: "……在这里你可以和其他玩家们进行代码肉搏战。"
     campaign_player_created: "已创建的玩家"
-    campaign_player_created_description: "...在这里你可以与你的小伙伴的创造力战斗 <a href=\"/contribute#artisan\">技术指导</a>."
+    campaign_player_created_description: "……在这里你可以与你的小伙伴的创造力战斗 <a href=\"/contribute#artisan\">技术指导</a>."
     level_difficulty: "难度"
 
   contact:
@@ -90,13 +90,13 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     contribute_suffix: "！"
     forum_prefix: "对任何公共部分，放手去干吧 "
     forum_page: "我们的论坛"
-    forum_suffix: "代替。"
+    forum_suffix: "代替 "
     send: "意见反馈"
 
   diplomat_suggestion:
-    title: "帮我们翻译CodeCombat"
+    title: "帮我们翻译 CodeCombat"
     sub_heading: "我们需要您的语言技能"
-    pitch_body: "我们开发了CodeCombat的英文版，但是现在我们的玩家遍布全球。很多人想玩中文（简体）版的，却不会说英语，所以如果你中英文都会，请考虑一下参加我们的翻译工作，帮忙把 CodeCombat 网站还有所有的关卡翻译成中文（简体）。"
+    pitch_body: "我们开发了 CodeCombat 的英文版，但是现在我们的玩家遍布全球。很多人想玩中文（简体）版的，却不会说英语，所以如果你中英文都会，请考虑一下参加我们的翻译工作，帮忙把 CodeCombat 网站还有所有的关卡翻译成中文（简体）。"
     missing_translations: "未翻译的文本将显示为英文。"
     learn_more: "了解更多有关成为翻译人员的说明"
     subscribe_as_diplomat: "提交翻译人员申请"
@@ -122,7 +122,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     new_password_verify: "核实"
     email_subscriptions: "邮箱验证"
     email_announcements: "通知"
-#    email_notifications_description: "Get periodic notifications for your account."
+    email_notifications_description: "定期接受来自你的账户的通知。"
     email_announcements_description: "接收关于 CodeCombat 最近的新闻和发展的邮件。"
     contributor_emails: "贡献者通知"
     contribute_prefix: "我们在寻找志同道合的人！请到 "
@@ -153,7 +153,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     level_load_error: "关卡不能载入。"
     done: "完成"
     grid: "格子"
-    customize_wizard: "自定义巫师"
+    customize_wizard: "自定义向导"
     home: "主页"
     guide: "指南"
     multiplayer: "多人游戏"
@@ -168,7 +168,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     victory_title_suffix: " 完成"
     victory_sign_up: "保存进度"
     victory_sign_up_poke: "想保存你的代码？创建一个免费账户吧！"
-    victory_rate_the_level: "评估关卡: "
+    victory_rate_the_level: "评估关卡："
     victory_play_next_level: "下一关"
     victory_go_home: "返回主页"
     victory_review: "给我们反馈！"
@@ -178,7 +178,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     multiplayer_link_description: "把这个链接告诉小伙伴们，一起玩吧。"
     multiplayer_hint_label: "提示："
     multiplayer_hint: " 点击全选，然后按 Apple-C（苹果电脑）或 Ctrl-C 复制链接。"
-    multiplayer_coming_soon: "多人游戏的更多特性!"
+    multiplayer_coming_soon: "多人游戏的更多特性！"
     guide_title: "指南"
     tome_minion_spells: "助手的咒语"
     tome_read_only_spells: "只读的咒语"
@@ -190,7 +190,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tome_select_spell: "选择一个法术"
     tome_select_a_thang: "选择人物来 "
     tome_available_spells: "可用的法术"
-    hud_continue: "继续 (按 shift-空格)"
+    hud_continue: "继续（按 shift-空格）"
 #    spell_saved: "Spell Saved"
 
 #  admin:

app/templates/contribute/diplomat.jade

@@ -57,7 +57,7 @@ block content
             | create an account
           span  
           span(data-i18n="contribute.alert_account_message_suf")
-          | first.
+            | first.
 
       label.checkbox(for="translator").well
         input(type='checkbox', name="translator", id="translator")