Merge branch 'master' of https://github.com/codecombat/codecombat

app/locale/es-419.coffee

@@ -307,7 +307,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     tip_premature_optimization: "La optimización prematura es la raíz de la maldad. - Donald Knuth"
     tip_brute_force: "Cuando tengas duda, usa la fuerza bruta. - Ken Thompson"
     tip_extrapolation: "Solo hay dos tipos de personas: Esas que pueden extrapolar desde información incompleta..."
-    tip_superpower: "Programar es lo más cercanos que tenemos a superpoderes."
+    tip_superpower: "Programar es lo más cercano que tenemos a superpoderes."
 
   game_menu:
     inventory_tab: "Inventario"
@@ -327,7 +327,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     auth_caption: "Guarda tu progreso."
 
   inventory:
-    choose_inventory: "Elegir artículos"
+    choose_inventory: "Equipar objetos"
     equipped_item: "Equipado"
 #    required_purchase_title: "Required"
     available_item: "Disponible"
@@ -360,9 +360,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     items: "Más de 250 ítems de bonus!"
     parents: "Para padres"
     parents_title: "Su hijo aprenderá a programar."
-    parents_blurb1: "Con CodeCombat, su hijo aprenderá a escribiendo código real. Empezaran aprendiendo comandos simples avanzando a tópicos más complejos."
+    parents_blurb1: "Con CodeCombat, su hijo aprenderá a escribiendo código real. Empezaran aprendiendo comandos simples avanzando a temas más complejos."
     parents_blurb2: "Por $9.99 USD/mes, recibirán nuevos desafíos todas las semanas y soporte personal por email de programadores profesionales."
-    parents_blurb3: "Sin Riesgo: Garantía de 100% de devolución, fácil 1-click y desuscribirse."
+    parents_blurb3: "Sin Riesgo: Garantía de 100% de devolución, fácil 1-click y des- suscribirse."
     subscribe_button: "Suscríbete  Ahora"
     stripe_description: "Suscripción Mensual"
     subscription_required_to_play: "Necesitas una suscripción para jugar este nivel."
@@ -374,10 +374,10 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     default: "por Defecto"
     experimental: "Experimental"
     python_blurb: "Simple pero poderoso."
-    javascript_blurb: "El lenguaje de la web."
+    javascript_blurb: "El lenguaje de la web (no es Java)."
-    coffeescript_blurb: "Mejor JavaScript."
+    coffeescript_blurb: "JavaScript pero más bonito."
     clojure_blurb: "Un Lisp moderno."
-    lua_blurb: "Para Juegos."
+    lua_blurb: "Lenguaje ara Juegos."
     io_blurb: "Simple pero oscuro."
     status: "Estado"
     weapons: "Armas"
@@ -415,7 +415,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     granted_by: "Concedido por"
 
   save_load:
-    granularity_saved_games: "Almacenado"
+    granularity_saved_games: "Guardado"
     granularity_change_history: "Historia"
 
   options:
@@ -428,9 +428,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     editor_config: "Config. de Editor"
     editor_config_title: "Configuración del Editor"
     editor_config_level_language_label: "Lenguaje para este Nivel"
-    editor_config_level_language_description: "Definir el lenguaje de programación para Este nivel."
+    editor_config_level_language_description: "Definir el lenguaje de programación para este nivel."
     editor_config_default_language_label: "Lenguaje de Programación Predeterminado"
-    editor_config_default_language_description: "Definir el lenguaje de programación que deseas para codificar cuando inicias nuevos niveles."
+    editor_config_default_language_description: "Definir el lenguaje de programación que deseas para programar cuando inicias nuevos niveles."
     editor_config_keybindings_label: "Atajos de Teclado"
     editor_config_keybindings_default: "Default (As)"
     editor_config_keybindings_description: "Añade atajos adicionales conocidos de los editores comunes."
@@ -449,9 +449,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     why_paragraph_2_prefix: "De eso se trata la programación. Será divertido. No casi divertido"
     why_paragraph_2_italic: "bien un premio"
     why_paragraph_2_center: "pero algo divertido"
-    why_paragraph_2_italic_caps: "¡NO MAMÁ, TENGO QUE FINALIZAR EL NIVEL!"
+    why_paragraph_2_italic_caps: "¡NO MAMÁ, TENGO QUE TERMINAR EL NIVEL!"
     why_paragraph_2_suffix: "Por tal motivo CodeCombat es un juego multiusuario, no un curso con gamificación. No finalizaremos hasta que terminemos--pero en esta ocasión, es una buena cosa."
-    why_paragraph_3: "si te vas a volver adicto a un juego, hazlo a este y conviértete en uno de los magos de la era tecnológica."
+    why_paragraph_3: "si te vas a volver adicto a un juego, que sea este y conviértete en uno de los magos de la era tecnológica."
     press_title: "Blogeros/Prensa"
     press_paragraph_1_prefix: "¿Quieres escribirnos? Descarga y usa con confianza todos los recursos incluídos en nuestro"
     press_paragraph_1_link: "paquete de prensa"

app/locale/ru.coffee

@@ -307,7 +307,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tip_premature_optimization: "Поспешная оптимизация - корень всех зол. - Donald Knuth"
     tip_brute_force: "Когда сомневаешься используй грубую силу. - Кен Томпсон"
     tip_extrapolation: "Есть два типа людей: те, кто могут экстраполировать неполные данные..."
-#    tip_superpower: "Coding is the closest thing we have to a superpower."
+    tip_superpower: "Программирование делает нас ближе к обретению суперсилы."
 
   game_menu:
     inventory_tab: "Инвентарь"
@@ -329,7 +329,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
   inventory:
     choose_inventory: "Выбрать предметы"
     equipped_item: "Выбранный"
-#    required_purchase_title: "Required"
+    required_purchase_title: "Необходимо"
     available_item: "Доступно"
     restricted_title: "Ограничено"
     should_equip: "(двойной клик чтобы надеть)"
@@ -482,13 +482,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     forum_prefix: "Для любых публичных обсуждений, пожалуйста, используйте "
     forum_page: "наш форум"
     forum_suffix: "."
-#    faq_prefix: "There's also a"
+    faq_prefix: "Так же у нас есть"
-#    faq: "FAQ"
+    faq: "ЧаВо"
     subscribe_prefix: "Если вам нужна помощь в прохождении уровня, пожалуйста,"
     subscribe: "купите подписку CodeCombat,"
     subscribe_suffix: "и мы будем рады помочь вам с вашим кодом."
     subscriber_support: "Ваши электронные письма получают нашу приоритетную поддержку, если вы подписчик CodeCombat."
-#    screenshot_included: "Screenshot included."
+    screenshot_included: "Скриншот прилагается."
     where_reply: "Куда мы должны ответить?"
     send: "Отправить отзыв"
     contact_candidate: "Связаться с кандидатом" # Deprecated

app/locale/vi.coffee

@@ -18,7 +18,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     play: "Các cấp độ" # The top nav bar entry where players choose which levels to play
 #    community: "Community"
     editor: "Chỉnh sửa"
-#    blog: "Blog"
+    blog: "Liếm cu"
     forum: "Diễn đàn"
 #    account: "Account"
 #    profile: "Profile"
@@ -31,7 +31,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     about: "Về"
     contact: "Liên hệ"
     twitter_follow: "Đi theo"
-#    teachers: "Teachers"
+    teachers: "Thầy Giáo"
 
   modal:
     close: "Đóng"
@@ -45,16 +45,16 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     sub_heading: "Chúng tôi cần kỹ năng ngoại ngữ của bạn."
     pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Vietnamese but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Vietnamese."
     missing_translations: "Until we can translate everything into Vietnamese, you'll see English when Vietnamese isn't available."
-#    learn_more: "Learn more about being a Diplomat"
+    learn_more: "Học làm người thông dịch"
 #    subscribe_as_diplomat: "Subscribe as a Diplomat"
 
   play:
-#    play_as: "Play As" # Ladder page
+    play_as: "Chơi là" # Ladder page
-#    spectate: "Spectate" # Ladder page
+    spectate: "Nhìn xem" # Ladder page
 #    players: "players" # Hover over a level on /play
-#    hours_played: "hours played" # Hover over a level on /play
+    hours_played: "Bao nhiêu tiếng chơi" # Hover over a level on /play
 #    items: "Items" # Tooltip on item shop button from /play
-#    unlock: "Unlock" # For purchasing items and heroes
+    unlock: "Mua" # For purchasing items and heroes
 #    confirm: "Confirm"
 #    owned: "Owned" # For items you own
 #    locked: "Locked"
@@ -68,9 +68,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    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
 #    choose_inventory: "Equip Items"
-#    buy_gems: "Buy Gems"
+    buy_gems: "Mua ngọc"
 #    campaign_desert: "Desert Campaign"
-#    campaign_forest: "Forest Campaign"
+    campaign_forest: "Chơi Rừng"
 #    campaign_dungeon: "Dungeon Campaign"
 #    subscription_required: "Subscription Required"
 #    free: "Free"
@@ -102,11 +102,11 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     log_in: "Đăng nhập"
 #    logging_in: "Logging In"
     log_out: "Đăng xuất"
-#    forgot_password: "Forgot your password?"
+    forgot_password: "Quên mật khẩu?"
 #    authenticate_gplus: "Authenticate G+"
 #    load_profile: "Load G+ Profile"
 #    load_email: "Load G+ Email"
-#    finishing: "Finishing"
+    finishing: "Đang xong"
 #    sign_in_with_facebook: "Sign in with Facebook"
 #    sign_in_with_gplus: "Sign in with G+"
 #    signup_switch: "Want to create an account?"
@@ -131,21 +131,21 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    armor: "Armor"
 #    accessories: "Accessories"
 #    misc: "Misc"
-#    books: "Books"
+    books: "Cuốn sách"
 
   common:
     loading: "Tải..."
     saving: "Lưu..."
     sending: "Gởi..."
-#    send: "Send"
+    send: "Gởi đi"
     cancel: "Hủy"
     save: "Lưu"
 #    publish: "Publish"
-#    create: "Create"
+    create: "Làm mới"
 #    manual: "Manual"
 #    fork: "Fork"
     play: "Các cấp độ" # When used as an action verb, like "Play next level"
-#    retry: "Retry"
+    retry: "Chơi lại"
 #    actions: "Actions"
 #    info: "Info"
 #    help: "Help"
@@ -154,10 +154,10 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    submit_patch: "Submit Patch"
 #    submit_changes: "Submit Changes"
 
-#  general:
+  general:
-#    and: "and"
+    and: "và"
-#    name: "Name"
+    name: "Tên"
-#    date: "Date"
+    date: "Ngày"
 #    body: "Body"
 #    version: "Version"
 #    submitter: "Submitter"
@@ -173,41 +173,41 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    result: "Result"
 #    results: "Results"
 #    description: "Description"
-#    or: "or"
+    or: "hay là"
 #    subject: "Subject"
 #    email: "Email"
 #    password: "Password"
 #    message: "Message"
 #    code: "Code"
 #    ladder: "Ladder"
-#    when: "When"
+    when: "Khi nào"
 #    opponent: "Opponent"
 #    rank: "Rank"
 #    score: "Score"
-#    win: "Win"
+    win: "Thắng"
-#    loss: "Loss"
+    loss: "Thua"
 #    tie: "Tie"
-#    easy: "Easy"
+    easy: "Dể"
-#    medium: "Medium"
+    medium: "Vừa"
-#    hard: "Hard"
+    hard: "Khó"
 #    player: "Player"
 #    player_level: "Level" # Like player level 5, not like level: Dungeons of Kithgard
 
-#  units:
+  units:
-#    second: "second"
+    second: "giây"
-#    seconds: "seconds"
+    seconds: "giây"
-#    minute: "minute"
+    minute: "phút"
-#    minutes: "minutes"
+    minutes: "phút"
-#    hour: "hour"
+    hour: "giờ"
-#    hours: "hours"
+    hours: "giờ"
-#    day: "day"
+    day: "ngày"
-#    days: "days"
+    days: "ngày"
-#    week: "week"
+    week: "tuần"
-#    weeks: "weeks"
+    weeks: "tuần"
-#    month: "month"
+    month: "tháng"
-#    months: "months"
+    months: "tháng"
-#    year: "year"
+    year: "năm"
-#    years: "years"
+    years: "năm"
 
   play_level:
     done: "Hoàn thành"
@@ -220,10 +220,10 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     goals: "Mục đích"
 #    goal: "Goal"
 #    running: "Running..."
-#    success: "Success!"
+    success: "Thắng!"
 #    incomplete: "Incomplete"
-#    timed_out: "Ran out of time"
+    timed_out: "Hết giờ"
-#    failing: "Failing"
+    failing: "Đang thua"
 #    action_timeline: "Action Timeline"
     click_to_select: "Kích vào đơn vị để chọn nó."
 #    control_bar_multiplayer: "Multiplayer"
@@ -232,9 +232,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     reload_title: "Tải lại tất cả mã?"
 #    reload_really: "Are you sure you want to reload this level back to the beginning?"
 #    reload_confirm: "Reload All"
-#    victory: "Victory"
+    victory: "Thắng"
 #    victory_title_prefix: ""
-#    victory_title_suffix: " Complete"
+    victory_title_suffix: " Xong"
 #    victory_sign_up: "Sign Up to Save Progress"
 #    victory_sign_up_poke: "Want to save your code? Create a free account!"
 #    victory_rate_the_level: "Rate the level: " # Only in old-style levels.
@@ -274,8 +274,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    time_current: "Now:"
 #    time_total: "Max:"
 #    time_goto: "Go to:"
-#    infinite_loop_try_again: "Try Again"
+    infinite_loop_try_again: "Chơi Lại"
-#    infinite_loop_reset_level: "Reset Level"
+    infinite_loop_reset_level: "Chơi Lại"
 #    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."