Merge remote-tracking branch 'upstream/master'

README.md

@@ -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)

app/lib/God.coffee

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

app/lib/surface/CocoSprite.coffee

@@ -252,7 +252,9 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
   updateAction: ->
     action = @determineAction()
     isDifferent = action isnt @currentRootAction
-    console.error "action is", action, "for", @thang?.id, "from", @currentRootAction, @thang.action, @thang.getActionName?() if not action and @thang?.actionActivated and @thang.id is 'Artillery'
+    if not action and @thang?.actionActivated and not @stopLogging
+      console.error "action is", action, "for", @thang?.id, "from", @currentRootAction, @thang.action, @thang.getActionName?()
+      @stopLogging = true
     @queueAction(action) if isDifferent or (@thang?.actionActivated and action.name isnt 'move')
     @updateActionDirection()
 

app/lib/surface/Surface.coffee

@@ -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

app/locale/ar.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/bg.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/cs.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     tome_available_spells: "Dostupná kouzla"
     hud_continue: "Pokračovat (stiskněte shift-mezera)"
     spell_saved: "Kouzlo uloženo"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Administrátorský pohled"

app/locale/da.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     tome_available_spells: "Tilgængelige trylleformularer"
     hud_continue: "Fortsæt (tryk skift-mellemrum)"
     spell_saved: "Trylleformularen er gemt"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
 #    av_title: "Admin Views"

app/locale/de.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     tome_available_spells: "Verfügbare Zauber"
     hud_continue: "Weiter (drücke Shift + Leertaste)"
     spell_saved: "Zauber gespeichert"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Administrator Übersicht"

app/locale/el.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/en-AU.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/en-GB.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/en-US.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/en.coffee

@@ -199,8 +199,9 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     tome_select_spell: "Select a Spell"
     tome_select_a_thang: "Select Someone for "
     tome_available_spells: "Available Spells"
-    hud_continue: "Continue (press shift-space)"
+    hud_continue: "Continue (shift+space)"
     spell_saved: "Spell Saved"
+    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Admin Views"

app/locale/es-419.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     tome_available_spells: "Hechizos Disponibles"
     hud_continue: "Continuar (presionar shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/es-ES.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     tome_available_spells: "Hechizos disponibles"
     hud_continue: "Continuar (pulsa Shift+Space)"
     spell_saved: "Hechizo guardado"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/es.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     tome_available_spells: "Hechizos Disponibles"
     hud_continue: "Continuar (presionar shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/fa.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/fi.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/fr.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     tome_available_spells: "Sorts diponibles"
     hud_continue: "Continuer (appuie sur shift ou espace)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Vues d'administrateurs"

app/locale/he.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/hi.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/hu.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     tome_available_spells: "Elérhető varázslatok"
     hud_continue: "Folytatás (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/id.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/it.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "italiano", englishDescription: "Italian", t
     tome_available_spells: "Incantesimi disponibili"
     hud_continue: "Continua (premi Maiusc-Spazio)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Vista amministratore"

app/locale/ja.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     tome_available_spells: "利用できる呪文"
     hud_continue: "続く　（Shift+Spaceキー）"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "管理画面"

app/locale/ko.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/lt.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/ms-BA.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/nb.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     tome_available_spells: "Tilgjenglige Trylleformularer"
     hud_continue: "Fortsett (trykk shift-mellomrom)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/nl.coffee

@@ -201,6 +201,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     tome_available_spells: "Beschikbare spreuken"
     hud_continue: "Ga verder (druk shift-space)"
     spell_saved: "Spreuk Opgeslagen"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Administrator panels"

app/locale/nn.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/no.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
     tome_available_spells: "Tilgjenglige Trylleformularer"
     hud_continue: "Fortsett (trykk shift-mellomrom)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/pl.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     tome_available_spells: "Dostępne czary"
     hud_continue: "Kontynuuj (naciśnij enter)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/pt-BR.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     tome_available_spells: "Feitiços Disponíveis"
     hud_continue: "Continue (tecle Shift+Space)"
     spell_saved: "Feitiço Salvo"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Visualização de Administrador"

app/locale/pt-PT.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     tome_available_spells: "Feitiços disponíveis"
     hud_continue: "Continuar (pressiona shift-space)"
     spell_saved: "Feitiço Guardado"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Visualizações de Admin"

app/locale/pt.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     tome_available_spells: "Feitiços Disponíveis"
     hud_continue: "Continue (tecle Shift+Space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/ro.coffee

@@ -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:"
+    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: "Receive announcements by email"
+    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: "Create de jucători"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
+    campaign_player_created_description: "... în care ai ocazia să testezi creativitatea colegilor tai <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
+    level_difficulty: "Dificultate: "
 
-#  contact:
+  contact:
-#    contact_us: "Contact CodeCombat"
+    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
+    welcome: "Folosiți acest formular pentru a ne trimite email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
+    contribute_prefix: "Dacă sunteți interesați in a contribui uitați-vă pe "
-#    contribute_page: "contribute page"
+    contribute_page: "pagina de contribuție"
-#    contribute_suffix: "!"
+    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
+    forum_prefix: "Pentru orice altceva vă rugăm sa incercați "
-#    forum_page: "our forum"
+    forum_page: "forumul nostru"
-#    forum_suffix: " instead."
+    forum_suffix: " în schimb."
-#    send: "Send Feedback"
+    send: "Trimite Feedback"
 
   diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
+    title: "Ajută-ne  să traducem CodeCombat!"
-#    sub_heading: "We need your language skills."
+    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."
+    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."
+    missing_translations: "Until we can translate everything into Romanian, you'll see English when Romanian isn't available." # is this still needed?
-#    learn_more: "Learn more about being a Diplomat"
+    learn_more: "Află mai multe despre cum să fi un Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    subscribe_as_diplomat: "Înscrie-te ca Diplomat"
 
-#  wizard_settings:
+  wizard_settings:
-#    title: "Wizard Settings"
+    title: "Setări Wizard"
-#    customize_avatar: "Customize Your Avatar"
+    customize_avatar: "Personalizează-ți Avatarul"
-#    clothes: "Clothes"
+    clothes: "Haine"
-#    trim: "Trim"
+    trim: "Margine" 
-#    cloud: "Cloud"
+    cloud: "Nor"
-#    spell: "Spell"
+    spell: "Vrajă"
-#    boots: "Boots"
+    boots: "Încălțăminte"
-#    hue: "Hue"
+    hue: "Culoare"
-#    saturation: "Saturation"
+    saturation: "Saturație"
-#    lightness: "Lightness"
+    lightness: "Luminozitate"
 
-#  account_settings:
+  account_settings:
-#    title: "Account Settings"
+    title: "Setări Cont"
-#    not_logged_in: "Log in or create an account to change your settings."
+    not_logged_in: "Loghează-te sau crează un cont nou pentru a schimba setările."
-#    autosave: "Changes Save Automatically"
+    autosave: "Modificările se salvează automat"
-#    me_tab: "Me"
+    me_tab: "Eu"
-#    picture_tab: "Picture"
+    picture_tab: "Poză"
-#    wizard_tab: "Wizard"
+    wizard_tab: "Wizard"
-#    password_tab: "Password"
+    password_tab: "Parolă"
-#    emails_tab: "Emails"
+    emails_tab: "Email-uri"
-#    gravatar_select: "Select which Gravatar photo to use"
+    gravatar_select: "Selectează ce poză Gravatar vrei să foloșesti"
-#    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
+    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: "Add more photos to your Gravatar account to access them here."
+    gravatar_add_more_photos: "Adaugă mai multe poze la contul tău Gravatar pentru a le accesa aici."
-#    wizard_color: "Wizard Clothes Color"
+    wizard_color: "Culoare haine pentru Wizard"
-#    new_password: "New Password"
+    new_password: "Parolă nouă"
-#    new_password_verify: "Verify"
+    new_password_verify: "Verifică"
-#    email_subscriptions: "Email Subscriptions"
+    email_subscriptions: "Subscripție Email"
-#    email_announcements: "Announcements"
+    email_announcements: "Anunțuri"
-#    email_notifications_description: "Get periodic notifications for your account."
+    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 "

app/locale/ru.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tome_available_spells: "Доступные заклинания"
     hud_continue: "Продолжить (нажмите Shift+Пробел)"
     spell_saved: "Заклинание сохранено"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Админ панель"

app/locale/sk.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/sl.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/sr.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     tome_available_spells: "Доступне чини"
     hud_continue: "Настави (притисни ентер)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/sv.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     tome_select_spell: "Välj en Förmåga"
     tome_select_a_thang: "Välj Någon för "
     tome_available_spells: "Tillgängliga Förmågor"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/th.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/tr.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     tome_available_spells: "Kullanılabilir Büyüler"
     hud_continue: "Devam (ÜstKarakter+Boşluk)"
     spell_saved: "Büyü Kaydedildi"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "Yönetici Görünümleri"

app/locale/uk.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
     tome_available_spells: "Доступні закляття"
     hud_continue: "Продовжити (натисніть shift-space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/ur.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/vi.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/zh-HANS.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tome_available_spells: "可用的法术"
     hud_continue: "继续（按 Shift-空格）"
     spell_saved: "咒语已保存"
+#    skip_tutorial: "Skip (esc)"
 
   admin:
     av_title: "管理员视图"

app/locale/zh-HANT.coffee

@@ -200,6 +200,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     tome_available_spells: "可用的法術"
     hud_continue: "繼續 (按 shift-空格)"
     spell_saved: "咒語已儲存"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/locale/zh.coffee

@@ -198,8 +198,9 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    hud_continue: "Continue (press shift-space)"
+#    hud_continue: "Continue (shift+space)"
 #    spell_saved: "Spell Saved"
+#    skip_tutorial: "Skip (esc)"
 
 #  admin:
 #    av_title: "Admin Views"

app/models/ThangType.coffee

@@ -157,7 +157,8 @@ module.exports = class ThangType extends CocoModel
     for groupName, config of options.colorConfig or {}
       colorConfigs.push "#{groupName}:#{config.hue}|#{config.saturation}|#{config.lightness}"
     colorConfigs = colorConfigs.join ','
-    "#{@get('name')} - #{options.resolutionFactor} - #{colorConfigs}"
+    portraitOnly = !!options.portraitOnly
+    "#{@get('name')} - #{options.resolutionFactor} - #{colorConfigs} - #{portraitOnly}"
 
   getPortraitImage: (spriteOptionsOrKey, size=100) ->
     src = @getPortraitSource(spriteOptionsOrKey, size)

app/styles/play/level/hud.sass

@@ -251,10 +251,7 @@
 
         .hud-hint
           font-weight: normal
-          color: #aaa
+          color: #999
-          position: absolute
-          top: 0
-          right: 4px
 
         .enter
           position: absolute

app/views/play/level/hud_view.coffee

@@ -175,9 +175,10 @@ module.exports = class HUDView extends View
         group.append(button)
         response.button = $('button:last', group)
     else
-      s = $.i18n.t('play_level.hud_continue', defaultValue: "Continue (press shift-space)")
+      s = $.i18n.t('play_level.hud_continue', defaultValue: "Continue (shift+space)")
-      if @shiftSpacePressed > 4 and not @escapePressed
+      sk = $.i18n.t('play_level.skip_tutorial', defaultValue: "skip: esc")
-        @bubble.append('<span class="hud-hint">skip: esc</span>')
+      if not @escapePressed
+        group.append('<span class="hud-hint">' + sk + '</span>')
       group.append($('<button class="btn btn-small banner with-dot">' + s + ' <div class="dot"></div></button>'))
       @lastResponses = null
     @bubble.append($("<h3>#{@speaker ? 'Captain Anya'}</h3>"))