Merge branch 'Titounkle-patch-4'

This commit is contained in:
Nick Winter 2014-09-12 10:22:43 -07:00
commit 1f6f2ebc94

View file

@ -652,21 +652,21 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
why_paragraph_2_italic_caps: "¡NO MAMA, TENGO QUE TERMINAR EL NIVEL!" why_paragraph_2_italic_caps: "¡NO MAMA, TENGO QUE TERMINAR EL NIVEL!"
why_paragraph_2_suffix: "Por eso Codecombat es multijugador, no un curso con lecciones \"gamificadas\" . No pararemos hasta que tú no puedas parar... pero esta vez, eso será buena señal." why_paragraph_2_suffix: "Por eso Codecombat es multijugador, no un curso con lecciones \"gamificadas\" . No pararemos hasta que tú no puedas parar... pero esta vez, eso será buena señal."
why_paragraph_3: "Si vas a engancharte a algún juego, engánchate a este y conviértete en uno de los magos de la era tecnológica." why_paragraph_3: "Si vas a engancharte a algún juego, engánchate a este y conviértete en uno de los magos de la era tecnológica."
# press_title: "Bloggers/Press" press_title: "Blogueros/Prensa"
# 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_prefix: "Quieres escribir sobre nosotros? Bajate y usa todos los recursos incluidos en nuestro"
# press_paragraph_1_link: "press packet" press_paragraph_1_link: "paquete de prensa"
# press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly." press_paragraph_1_suffix: ". Todos los logos y las imagenes pueden ser usados sin necesidad de contactarnos directamente."
# team: "Team" team: "Equipo"
# george_title: "CEO" george_title: "CEO"
# george_blurb: "Businesser" george_blurb: "Hombre de Negocios"
# scott_title: "Programmer" scott_title: "Programador"
# scott_blurb: "Reasonable One" scott_blurb: "Razonable"
# nick_title: "Programmer" nick_title: "Programador"
# nick_blurb: "Motivation Guru" nick_blurb: "Guru Motivacional"
# michael_title: "Programmer" michael_title: "Programador"
# michael_blurb: "Sys Admin" michael_blurb: "Administrador de Sistemas"
# matt_title: "Programmer" matt_title: "Programador"
# matt_blurb: "Bicyclist" matt_blurb: "Ciclista"
legal: legal:
page_title: "Legal" page_title: "Legal"
@ -878,7 +878,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
tournament_ended: "El torneo ha terminado" tournament_ended: "El torneo ha terminado"
tournament_rules: "Reglas del Torneo" tournament_rules: "Reglas del Torneo"
tournament_blurb: "Escribe codigo, recolecta oro, construye ejercitos, aplasta a los malos, gana premios, y sube en tu carrera en nuestro Torneo de la Avaricia con $40,000! Ver los detalles" tournament_blurb: "Escribe codigo, recolecta oro, construye ejercitos, aplasta a los malos, gana premios, y sube en tu carrera en nuestro Torneo de la Avaricia con $40,000! Ver los detalles"
# 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_criss_cross: "Gana pujas, construye caminos, aniquila a tus oponentes, recoge gemas, y mejora tu carrera en nuestro torneo Criss-Cross! Mira los detalles"
tournament_blurb_blog: "en nuestro blog" tournament_blurb_blog: "en nuestro blog"
rules: "Reglas" rules: "Reglas"
winners: "Ganadores" winners: "Ganadores"
@ -896,7 +896,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
in_cash: "en dinero" in_cash: "en dinero"
custom_wizard: "Personaliza tu Mago de CodeCombat" custom_wizard: "Personaliza tu Mago de CodeCombat"
custom_avatar: "Personaliza tu avatar de CoceCombat" custom_avatar: "Personaliza tu avatar de CoceCombat"
# heap: "for six months of \"Startup\" access" heap: "Por seis meses de acceso \"Startup\""
credits: "creditos" credits: "creditos"
one_month_coupon: "cupon: elige entre Rails o HTML" one_month_coupon: "cupon: elige entre Rails o HTML"
one_month_discount: "descuento del 30%: elige entre Rails o HTML" one_month_discount: "descuento del 30%: elige entre Rails o HTML"
@ -946,61 +946,61 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
files: "Archivos" files: "Archivos"
top_simulators: "Top simuladores" top_simulators: "Top simuladores"
source_document: "Documento fuente" source_document: "Documento fuente"
# document: "Document" document: "Documento"
# sprite_sheet: "Sprite Sheet" # sprite_sheet: "Sprite Sheet"
# employers: "Employers" employers: "Empleados"
# candidates: "Candidates" candidates: "Candidatos"
# candidate_sessions: "Candidate Sessions" candidate_sessions: "Sesiones de Candidato"
# user_remark: "User Remark" # user_remark: "User Remark"
# user_remarks: "User Remarks" # user_remarks: "User Remarks"
# versions: "Versions" versions: "Versiones"
# items: "Items" items: "Objetos"
# wizard: "Wizard" wizard: "Mago"
# achievement: "Achievement" achievement: "Logro"
# clas: "CLAs" # clas: "CLAs"
# play_counts: "Play Counts" play_counts: "Contador de Juegos"
# feedback: "Feedback" # feedback: "Feedback"
delta: delta:
added: "Añadido" added: "Añadido"
modified: "Modificado" modified: "Modificado"
deleted: "Eliminado" deleted: "Eliminado"
# moved_index: "Moved Index" moved_index: "Indice Movido"
# text_diff: "Text Diff" # text_diff: "Text Diff"
# merge_conflict_with: "MERGE CONFLICT WITH" # merge_conflict_with: "MERGE CONFLICT WITH"
no_changes: "Sin Cambios" no_changes: "Sin Cambios"
# user: user:
# stats: "Stats" stats: "Estadisticas"
# singleplayer_title: "Singleplayer Levels" singleplayer_title: "Niveles Individuales"
# multiplayer_title: "Multiplayer Levels" multiplayer_title: "Niveles Multijugador"
# achievements_title: "Achievements" achievements_title: "Logros"
# last_played: "Last Played" last_played: "Ultimo Jugado"
# status: "Status" status: "Estatus"
# status_completed: "Completed" status_completed: "Completado"
# status_unfinished: "Unfinished" status_unfinished: "Sin Terminar"
# no_singleplayer: "No Singleplayer games played yet." no_singleplayer: "No has jugado ningun nivel individual todavia."
# no_multiplayer: "No Multiplayer games played yet." no_multiplayer: "No has jugado ningun nivel multijugador todavia."
# no_achievements: "No Achievements earned yet." no_achievements: "No has alcanzado ningun logro todavia."
# favorite_prefix: "Favorite language is " favorite_prefix: "Favorite language is "
# favorite_postfix: "." favorite_postfix: "."
# achievements: achievements:
# last_earned: "Last Earned" last_earned: "Ganado la ultima vez"
# amount_achieved: "Amount" amount_achieved: "Cantidad"
# achievement: "Achievement" achievement: "Logro"
# category_contributor: "Contributor" category_contributor: "Contribuidor"
# category_miscellaneous: "Miscellaneous" category_miscellaneous: "Miscelanea"
# category_levels: "Levels" category_levels: "Niveles"
# category_undefined: "Uncategorized" category_undefined: "Sin categorizar"
# current_xp_prefix: "" current_xp_prefix: ""
# current_xp_postfix: " in total" current_xp_postfix: " en total"
# new_xp_prefix: "" new_xp_prefix: ""
# new_xp_postfix: " earned" new_xp_postfix: " ganado"
# left_xp_prefix: "" left_xp_prefix: ""
# left_xp_infix: " until level " left_xp_infix: " hasta el nivel"
# left_xp_postfix: "" left_xp_postfix: ""
# account: account:
# recently_played: "Recently Played" recently_played: "Jugado Recientemente"
# no_recent_games: "No games played during the past two weeks." no_recent_games: "No he jugado juegos en las ultimas dos semanas."