codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 10:35:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-10-16 14:56:16 -07:00
commit a4af474cf6
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/locale/en.coffee
View file

@ -1355,9 +1355,6 @@
merge_conflict_with: "MERGE CONFLICT WITH" merge_conflict_with: "MERGE CONFLICT WITH"
no_changes: "No Changes" no_changes: "No Changes"
temp:
ace_of_coders_tournament: "New: play in the Ace of Coders tournament now!"
multiplayer: multiplayer:
multiplayer_title: "Multiplayer Settings" # We'll be changing this around significantly soon. Until then, it's not important to translate. multiplayer_title: "Multiplayer Settings" # We'll be changing this around significantly soon. Until then, it's not important to translate.
multiplayer_toggle: "Enable multiplayer" multiplayer_toggle: "Enable multiplayer"

10
app/locale/es-419.coffee
View file

@ -607,7 +607,7 @@ 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_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!" intro_2: "No se necesita experiencia previa!"
free_title: "¿Cuánto cuesta?" free_title: "¿Cuánto cuesta?"
# cost_premium_server: "CodeCombat is free for the first five levels, after which it costs $9.99 USD per month for access to our other 190+ levels on our exclusive country-specific servers." cost_premium_server: "CodeCombat es gratis para lso primeros 5 niveles, después de ellos cuesta $9.99 USD mensuales para accesar a nuestros otros más de 190 niveles en nuestraos exclusivos servidores específicos para cada país."
free_1: "Hay más de 110 niveles gratis que cubren cada concepto." free_1: "Hay más de 110 niveles gratis que cubren cada concepto."
free_2: "Una suscripción mensual le da acceso a tutoriales en vídeo y niveles extra para practicar." 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_title: "¡Los amestros obtienen subscripciones gratuitas!"
@ -871,10 +871,10 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
play_time: "Tiempo de Juego:" play_time: "Tiempo de Juego:"
completed: "Completados:" completed: "Completados:"
invite_students: "Invite a sus estudiantes a unirse a este grupo." invite_students: "Invite a sus estudiantes a unirse a este grupo."
# invite_link_header: "Link to join course" invite_link_header: "Enlace para unirse al curso"
# invite_link_p_1: "Give this link to students you would like to have join the course." invite_link_p_1: "Proporciones este enalce a los estudiantes que desee que se unan al curso."
# invite_link_p_2: "Or have us email them directly:" #invite_link_p_2: "O have us email them directamente:"
# capacity_used: "Course slots used:" capacity_used: "Espacios de curso usados:"
enter_emails: "Introducir los emails de los estudiantes a invitar, uno por línea" enter_emails: "Introducir los emails de los estudiantes a invitar, uno por línea"
send_invites: "¿Mandar Invitaciones?" send_invites: "¿Mandar Invitaciones?"
title: "Título" title: "Título"

2
app/templates/base.jade
View file

@ -38,7 +38,7 @@ block header
li li
a(href="/account/subscription", data-i18n="account.subscription") a(href="/account/subscription", data-i18n="account.subscription")
li li
a(href="/account/prepaid") Prepaid Codes a(href="/account/prepaid", data-i18n="account.prepaid_codes") Prepaid Codes
li li
a#logout-button(data-i18n="login.log_out") a#logout-button(data-i18n="login.log_out")

5
app/templates/home-view.jade
View file

@ -16,8 +16,9 @@ block outer_content
//a(href="https://itunes.apple.com/us/app/codecombat/id936523909?mt=8") //a(href="https://itunes.apple.com/us/app/codecombat/id936523909?mt=8")
// img(src="/images/pages/home/app_store_badge.svg")#apple-store-button // img(src="/images/pages/home/app_store_badge.svg")#apple-store-button
#news // Example of how to throw down a temporary news link
a(href="/play/ladder/ace-of-coders", data-i18n="temp.ace_of_coders_tournament") New: play in the Ace of Coders tournament now! //#news
// a(href="/play/ladder/ace-of-coders", data-i18n="temp.ace_of_coders_tournament") New: play in the Ace of Coders tournament now!
#slogan(data-i18n="home.slogan") #slogan(data-i18n="home.slogan")