codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 01:55:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Scott Erickson 2014-03-05 12:53:57 -08:00
commit 7a2d5b4bff
4 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -52,6 +52,6 @@ Whether you're novice or pro, the CodeCombat team is ready to help you implement
----------
[![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/challengepost.png)](http://codecombat.challengepost.com/?utm_source-github&utm_medium-oswidget&utm_campaign-codecombat)
[![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/challengepost.png)](http://codecombat.challengepost.com/?utm_source=github&utm_medium=oswidget&utm_campaign=codecombat)
[![](http://1-ps.googleusercontent.com/x/s.google-melange.appspot.com/www.google-melange.com/soc/content/2-1-20140225/images/gsoc/logo/920x156xbanner-gsoc2014.png.pagespeed.ic.gdr4t3Igca.png)](http://www.google-melange.com/gsoc/homepage/google/gsoc2014)

2
app/lib/God.coffee
View file

@ -227,7 +227,7 @@ class Angel
_.delay ->
worker.terminate()
worker.removeEventListener 'message', onWorkerMessage
, 2000
, 3000
@worker = null
@

1
app/lib/surface/Surface.coffee
View file

@ -502,6 +502,7 @@ module.exports = Surface = class Surface extends CocoClass
# Skip some frame updates unless we're playing and not at end (or we haven't drawn much yet)
frameAdvanced = (@playing and @currentFrame < @world.totalFrames) or @totalFramesDrawn < 2
@currentFrame += @world.frameRate / @options.frameRate if frameAdvanced and @playing
@currentFrame = Math.min(@currentFrame, @world.totalFrames - 1)
newWorldFrame = Math.floor @currentFrame
worldFrameAdvanced = newWorldFrame isnt oldWorldFrame
if worldFrameAdvanced

107
app/locale/ro.coffee
View file

@ -1,6 +1,6 @@
module.exports = nativeDescription: "limba română", englishDescription: "Romanian", translation:
common:
loading: "Loading..."
loading: "Se incarcă..."
saving: "Se salvează..."
sending: "Se trimite..."
cancel: "Anulează"
@ -53,8 +53,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
signup:
create_account_title: "Crează cont pentru a salva progresul"
description: "Este gratis. Doar câte ceva inainte si poți continua:"#contextual translation a bit off, could be better# It's free. Just need a couple things and you'll be good to go:"
email_announcements: "Receive announcements by email"
description: "Este gratis. Doar un scurt formular inainte si poți continua:"#contextual translation a bit off, could be better# It's free. Just need a couple things and you'll be good to go:"
email_announcements: "Primește notificări prin emaill"
coppa: "13+ sau non-USA "
coppa_why: "(De ce?)"
creating: "Se crează contul..."
@ -63,7 +63,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
home:
slogan: "Învață sa scri JavaScript jucându-te"# again sounds funny# Learn to Code JavaScript by Playing a Game"
no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!"
no_ie: "CodeCombat nu merge pe Internet Explorer 9 sau mai vechi. Scuze!"
no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile si s-ar putea sa nu meargâ!"
play: "Joacâ"
@ -78,59 +78,59 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
campaign_dev_description: "... în care se învață interfața, cu o dificultate puțin mai mare."
campaign_multiplayer: "Arene Multiplayer"
campaign_multiplayer_description: "... în care te lupți cap-la-cap contra alti jucători."
# campaign_player_created: "Player-Created"
# campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
# level_difficulty: "Difficulty: "
campaign_player_created: "Create de jucători"
campaign_player_created_description: "... în care ai ocazia să testezi creativitatea colegilor tai <a href=\"/contribute#artisan\">Artisan Wizards</a>."
level_difficulty: "Dificultate: "
# contact:
# contact_us: "Contact CodeCombat"
# welcome: "Good to hear from you! Use this form to send us email. "
# contribute_prefix: "If you're interested in contributing, check out our "
# contribute_page: "contribute page"
# contribute_suffix: "!"
# forum_prefix: "For anything public, please try "
# forum_page: "our forum"
# forum_suffix: " instead."
# send: "Send Feedback"
contact:
contact_us: "Contact CodeCombat"
welcome: "Folosiți acest formular pentru a ne trimite email. "
contribute_prefix: "Dacă sunteți interesați in a contribui uitați-vă pe "
contribute_page: "pagina de contribuție"
contribute_suffix: "!"
forum_prefix: "Pentru orice altceva vă rugăm sa incercați "
forum_page: "forumul nostru"
forum_suffix: " în schimb."
send: "Trimite Feedback"
diplomat_suggestion:
# title: "Help translate CodeCombat!"
# sub_heading: "We need your language skills."
pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Romanian 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 Romanian."
missing_translations: "Until we can translate everything into Romanian, you'll see English when Romanian isn't available."
# learn_more: "Learn more about being a Diplomat"
# subscribe_as_diplomat: "Subscribe as a Diplomat"
title: "Ajută-ne să traducem CodeCombat!"
sub_heading: "Avem nevoie de abilitățile tale lingvistice."
pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Romanian 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 Romanian." #are these still needed??
missing_translations: "Until we can translate everything into Romanian, you'll see English when Romanian isn't available." # is this still needed?
learn_more: "Află mai multe despre cum să fi un Diplomat"
subscribe_as_diplomat: "Înscrie-te ca Diplomat"
# wizard_settings:
# title: "Wizard Settings"
# customize_avatar: "Customize Your Avatar"
# clothes: "Clothes"
# trim: "Trim"
# cloud: "Cloud"
# spell: "Spell"
# boots: "Boots"
# hue: "Hue"
# saturation: "Saturation"
# lightness: "Lightness"
wizard_settings:
title: "Setări Wizard"
customize_avatar: "Personalizează-ți Avatarul"
clothes: "Haine"
trim: "Margine"
cloud: "Nor"
spell: "Vrajă"
boots: "Încălțăminte"
hue: "Culoare"
saturation: "Saturație"
lightness: "Luminozitate"
# account_settings:
# title: "Account Settings"
# not_logged_in: "Log in or create an account to change your settings."
# autosave: "Changes Save Automatically"
# me_tab: "Me"
# picture_tab: "Picture"
# wizard_tab: "Wizard"
# password_tab: "Password"
# emails_tab: "Emails"
# gravatar_select: "Select which Gravatar photo to use"
# gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
# gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
# wizard_color: "Wizard Clothes Color"
# new_password: "New Password"
# new_password_verify: "Verify"
# email_subscriptions: "Email Subscriptions"
# email_announcements: "Announcements"
# email_notifications_description: "Get periodic notifications for your account."
account_settings:
title: "Setări Cont"
not_logged_in: "Loghează-te sau crează un cont nou pentru a schimba setările."
autosave: "Modificările se salvează automat"
me_tab: "Eu"
picture_tab: "Poză"
wizard_tab: "Wizard"
password_tab: "Parolă"
emails_tab: "Email-uri"
gravatar_select: "Selectează ce poză Gravatar vrei să foloșesti"
gravatar_add_photos: "Adaugă thumbnails și poze la un cont Gravatar pentru email-ul tău pentru a alege o imagine."
gravatar_add_more_photos: "Adaugă mai multe poze la contul tău Gravatar pentru a le accesa aici."
wizard_color: "Culoare haine pentru Wizard"
new_password: "Parolă nouă"
new_password_verify: "Verifică"
email_subscriptions: "Subscripție Email"
email_announcements: "Anunțuri"
email_notifications_description: "Get periodic notifications for your account."
# email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
# contributor_emails: "Contributor Class Emails"
# contribute_prefix: "We're looking for people to join our party! Check out the "
@ -198,9 +198,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
# tome_select_spell: "Select a Spell"
# tome_select_a_thang: "Select Someone for "
# tome_available_spells: "Available Spells"
# hud_continue: "Continue (shift+space)"
# hud_continue: "Continue (press shift-space)"
# spell_saved: "Spell Saved"
# skip_tutorial: "Skip (esc)"
# admin:
# av_title: "Admin Views"