diff --git a/app/core/Router.coffee b/app/core/Router.coffee
index a3ffdb0df..0c4257040 100644
--- a/app/core/Router.coffee
+++ b/app/core/Router.coffee
@@ -1,8 +1,6 @@
gplusClientID = '800329290710-j9sivplv2gpcdgkrsis9rff3o417mlfa.apps.googleusercontent.com'
# TODO: Move to GPlusHandler
-NotFoundView = require('views/core/NotFoundView')
-
go = (path) -> -> @routeDirectly path, arguments
module.exports = class CocoRouter extends Backbone.Router
@@ -59,6 +57,12 @@ module.exports = class CocoRouter extends Backbone.Router
'contribute/diplomat': go('contribute/DiplomatView')
'contribute/scribe': go('contribute/ScribeView')
+ 'courses': -> @navigate('courses/mock1')
+ 'courses/mock1': go('courses/mock1/CoursesView')
+ 'courses/mock1/:courseID': go('courses/mock1/CourseDetailsView')
+ 'courses/mock1/:courseID/info': go('courses/mock1/CourseInfoView')
+ 'courses/mock1/:courseID/enroll': go('courses/mock1/CourseEnrollView')
+
'db/*path': 'routeToServer'
'demo(/*subpath)': go('DemoView')
'docs/components': go('docs/ComponentsDocumentationView')
@@ -118,7 +122,7 @@ module.exports = class CocoRouter extends Backbone.Router
#'user/:slugOrID/profile': go('user/JobProfileView')
'user/:slugOrID/profile': go('EmployersView') # Show the not-recruiting-now screen
- '*name': 'showNotFoundView'
+ '*name': go('NotFoundView')
routeToServer: (e) ->
window.location.href = window.location.href
@@ -142,13 +146,6 @@ module.exports = class CocoRouter extends Backbone.Router
if error.toString().search('Cannot find module "' + path + '" from') is -1
throw error
- showNotFoundView: ->
- @openView @notFoundView()
-
- notFoundView: ->
- view = new NotFoundView()
- view.render()
-
openView: (view) ->
@closeCurrentView()
$('#page-container').empty().append view.el
diff --git a/app/lib/world/names.coffee b/app/lib/world/names.coffee
index 9fa4cd2c8..33880a3be 100644
--- a/app/lib/world/names.coffee
+++ b/app/lib/world/names.coffee
@@ -40,12 +40,14 @@ module.exports.thangNames = thangNames =
'Thabt'
'Treg'
'Ursa'
+ 'Vorobun'
'Weeb'
'Yart'
'Zozo'
]
'Ogre Thrower': [
# Female
+ 'Beebatha'
'Drumbaa'
'Durnath'
'Esha'
@@ -72,6 +74,7 @@ module.exports.thangNames = thangNames =
'Cristofide'
'Denestorath'
'Letholdus'
+ 'Loretha'
]
'Paladin': [
# Female
@@ -94,6 +97,7 @@ module.exports.thangNames = thangNames =
# Male
'Vax'
'Vyrryx'
+ 'Vyjj'
]
'Ogre Scout M': [
# Male
@@ -170,6 +174,7 @@ module.exports.thangNames = thangNames =
# Male
'Axe Ox'
'Belch'
+ 'Booz'
'Brusentsov'
'Dronck'
'Gorlog'
@@ -306,6 +311,7 @@ module.exports.thangNames = thangNames =
'Sphenoid'
'Sternum'
'Talus'
+ 'Tatava'
'Ulna'
'Yorick'
'Boneus'
@@ -428,6 +434,7 @@ module.exports.thangNames = thangNames =
'Fidsdale'
'Gimsley'
'Hunter'
+ 'Kikariy'
'Legolas'
'Loco'
'Logos'
@@ -777,6 +784,7 @@ module.exports.thangNames = thangNames =
'Rose'
'Ruby'
'Ruth'
+ 'Sana'
'Sandra'
'Sara'
'Sarah'
@@ -841,6 +849,7 @@ module.exports.thangNames = thangNames =
'Matilda'
'Nordex'
'Satish'
+ 'Vera'
]
'Equestrian': [
# Male
@@ -927,6 +936,7 @@ module.exports.thangNames = thangNames =
'Samurai': [
# Male
'Hattori'
+ 'Hirosha'
'Ieyasu'
'Izotokogawa'
'Keitaro'
diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee
index 718386713..546e98e74 100644
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee
index 84743619a..c35ea31e2 100644
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "български език", englishDescri
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "български език", englishDescri
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "български език", englishDescri
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "български език", englishDescri
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "български език", englishDescri
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee
index 10ecb6bc8..50fbf8b8d 100644
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
# retrostyle_blurb: "RetroStyle Games"
teachers:
- title: "CodeCombat per a professors" # {change}
+ title: "CodeCombat per a professors"
# intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
# intro_2: "No experience required!"
# free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
picture_tab: "Foto"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Carrega una foto"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
admin: "Administrador"
new_password: "Contrasenya nova"
new_password_verify: "Verifica"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Subscripcions via correu electrònic"
email_subscriptions_none: "Sense subsrcipcions de correu electrònic."
email_announcements: "Notícies"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
keyboard_shortcuts: "Dreceres del teclat"
space: "Espai"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee
index 616ff15ef..33eae2e21 100644
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
# retrostyle_blurb: "RetroStyle Games"
teachers:
- title: "CodeCombat pro učitele" # {change}
+ title: "CodeCombat pro učitele"
# intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
# intro_2: "No experience required!"
# free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
picture_tab: "Obrázek"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Nahrát obrázek"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
admin: "Admin"
new_password: "Nové heslo"
new_password_verify: "Potvrdit"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Odebírat emailem"
email_subscriptions_none: "Žádné odebírání emailem."
email_announcements: "Oznámení"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
keyboard_shortcuts: "Klávesové zkratky"
space: "Mezerník"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: "Spustit současný kód."
diff --git a/app/locale/da.coffee b/app/locale/da.coffee
index f15a5f3a2..286b04c5e 100644
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@@ -155,7 +155,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
info: "Info"
help: "Hjælp"
watch: "Hold øje"
- unwatch: "Stop med at holde øje" # alternately "Ignorer", but not really perfect either
+ unwatch: "Stop med at holde øje"
submit_patch: "Indsend patch"
submit_changes: "Indsend ændringer"
save_changes: "Gem ændringer"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
picture_tab: "Billede"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
# admin: "Admin"
new_password: "Nyt Password"
new_password_verify: "Bekræft"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Emailtilmeldinger"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Nyheder"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee
index 13678a31f..ff71c3f7a 100644
--- a/app/locale/de-AT.coffee
+++ b/app/locale/de-AT.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
picture_tab: "Bild"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Ein Bild hochladen"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
admin: "Admin"
new_password: "Neues Passwort"
new_password_verify: "Passwort verifizieren"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Email Abonnements"
email_subscriptions_none: "Keine Email Abonnements."
email_announcements: "Ankündigungen"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
keyboard_shortcuts: "Tastaturkürzel"
space: "Leertaste"
enter: "Eingabetaste"
+# press_enter: "press enter"
escape: "Escape"
shift: "Umschalttaste"
# run_code: "Run current code."
diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee
index 5b03c9bf1..cf88d26ff 100644
--- a/app/locale/de-CH.coffee
+++ b/app/locale/de-CH.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
picture_tab: "Bild"
delete_account_tab: "Din Account lösche"
wrong_email: "Falschi Email Adrässe"
+# wrong_password: "Wrong Password"
upload_picture: "Es Bild ufelade"
delete_this_account: "Dä Account für immer Lösche"
god_mode: "Gott Modus"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
admin: "Admin"
new_password: "Neus Passwort"
new_password_verify: "Bestätige"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "E-Mail Abos"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Akündigunge"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
keyboard_shortcuts: "Shortcuts uf de Tastatur"
space: "Space"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: "De jetzig Code laufe laa."
diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee
index 615f5b495..505329a0f 100644
--- a/app/locale/de-DE.coffee
+++ b/app/locale/de-DE.coffee
@@ -415,7 +415,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
feature6: "Premium Emailsupport"
# feature7: "Private Clans"
free: "Kostenlos"
- month: "Monate"
+ month: "Monat"
subscribe_title: "Abonnieren"
unsubscribe: "Abmelden"
confirm_unsubscribe: "Abmeldung bestätigen"
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
retrostyle_blurb: "RetroStyle Games"
teachers:
- title: "CodeCombat für Lehrer" # {change}
+ title: "CodeCombat für Lehrer"
# intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
# intro_2: "No experience required!"
# free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
picture_tab: "Bild"
delete_account_tab: "Account löschen"
wrong_email: "Falsche Email Adresse"
+# wrong_password: "Wrong Password"
upload_picture: "Ein Bild hochladen"
delete_this_account: "Das Löschen deines Accounts kann nicht rückgängig gemacht werden!"
god_mode: "Gottmodus"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
new_password: "Neues Passwort"
new_password_verify: "Passwort verifizieren"
type_in_email: "Email eingeben, um Löschung zu bestätigen"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Email Abonnements"
email_subscriptions_none: "Keine Email Abonnements."
email_announcements: "Ankündigungen"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
keyboard_shortcuts: "Tastaturkürzel"
space: "Leertaste"
enter: "Eingabetaste"
+# press_enter: "press enter"
escape: "Escape"
shift: "Umschalttaste"
run_code: "Starte aktuellen Code."
diff --git a/app/locale/el.coffee b/app/locale/el.coffee
index 8aed7638f..a1795a684 100644
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
picture_tab: "Φωτογραφία"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Ανέβασμα φωτογραφίας"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
admin: "Διαχειριστής"
new_password: "Καινούργιος Κωδικός"
new_password_verify: " Επαλήθευση Κωδικού"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Συνδρομές Email"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Ανακοινώσεις"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee
index 37b880edf..558bff3cf 100644
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index cb5f6a342..57ac0b138 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 4bc8ef36f..3647f5d28 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -568,10 +568,6 @@
why_paragraph_2_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing."
why_paragraph_3: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age."
press_title: "Bloggers/Press"
- contact_title: "Contact"
- codecombat_inc: "CodeCombat, Inc."
- address_part_1: "188 King St #507"
- address_part_2: "San Francisco, CA 94107"
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_link: "press packet"
press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
@@ -651,12 +647,12 @@
must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
retrieving: "Retrieving information..."
being_reviewed_1: "Your application for a free trial subscription is being"
- being_reviewed_2: "reviewed." # {change}
+ being_reviewed_2: "reviewed."
approved_1: "Your application for a free trial subscription was"
- approved_2: "approved." # {change}
+ approved_2: "approved."
approved_3: "Further instructions have been sent to"
denied_1: "Your application for a free trial subscription has been"
- denied_2: "denied." # {change}
+ denied_2: "denied."
contact_1: "Please contact"
contact_2: "if you have further questions."
description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -682,6 +678,7 @@
cla_url: "CLA"
cla_suffix: "."
cla_agree: "I AGREE"
+ owner_approve: "An owner will need to approve it before your changes will become visible."
contact:
contact_us: "Contact CodeCombat"
@@ -709,6 +706,7 @@
picture_tab: "Picture"
delete_account_tab: "Delete Your Account"
wrong_email: "Wrong Email"
+ wrong_password: "Wrong Password"
upload_picture: "Upload a picture"
delete_this_account: "Delete this account permanently"
god_mode: "God Mode"
@@ -717,7 +715,8 @@
admin: "Admin"
new_password: "New Password"
new_password_verify: "Verify"
- type_in_email: "Type in your email to confirm the deletion"
+ type_in_email: "Type in your email to confirm account deletion." # {change}
+ type_in_password: "Also, type in your password." # {change}
email_subscriptions: "Email Subscriptions"
email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Announcements"
@@ -748,6 +747,7 @@
keyboard_shortcuts: "Keyboard Shortcuts"
space: "Space"
enter: "Enter"
+ press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: "Run current code."
@@ -927,6 +927,8 @@
pop_i18n: "Populate I18N"
tasks: "Tasks"
clear_storage: "Clear your local changes"
+ add_system_title: "Add Systems to Level"
+ done_adding: "Done Adding"
article:
edit_btn_preview: "Preview"
@@ -1190,6 +1192,26 @@
poll: "Poll"
user_polls_record: "Poll Voting History"
+ concepts:
+ advanced_strings: "Advanced Strings"
+ algorithms: "Algorithms"
+ arithmetic: "Arithmetic"
+ arrays: "Arrays"
+ basic_syntax: "Basic Syntax"
+ boolean_logic: "Boolean Logic"
+ break_statements: "Break Statements"
+ classes: "Classes"
+ for_loops: "For Loops"
+ functions: "Functions"
+ if_statements: "If Statements"
+ input_handling: "Input Handling"
+ math_operations: "Math Operations"
+ object_literals: "Object Literals"
+ strings: "Strings"
+ variables: "Variables"
+ vectors: "Vectors"
+ while_loops: "While Loops"
+
delta:
added: "Added"
modified: "Modified"
diff --git a/app/locale/eo.coffee b/app/locale/eo.coffee
index 3cec1d64b..60fc113cd 100644
--- a/app/locale/eo.coffee
+++ b/app/locale/eo.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee
index 20330e441..03b7ca979 100644
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
retrostyle_blurb: "Juegos con estilo Retro"
teachers:
- title: "CodeCombat para Profesores" # {change}
+ title: "CodeCombat para Profesores"
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!"
free_title: "¿Cuanto cuesta?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
picture_tab: "Imagen"
delete_account_tab: "Borra tu cuenta"
wrong_email: "Mail Incorrecto"
+# wrong_password: "Wrong Password"
upload_picture: "Sube una imagen"
delete_this_account: "Borrar esta cuenta permanentemente"
god_mode: "Modo Dios"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
new_password: "Nueva Contraseña"
new_password_verify: "Verificar"
type_in_email: "Ingrese su correo electrónico para confirmar la eliminación"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Suscripciones de Email"
email_subscriptions_none: "No tienes suscripciones."
email_announcements: "Noticias"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
keyboard_shortcuts: "Atajos de teclado"
space: "Barra espaciadora"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: "Ejecutar el código."
diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index b66aab1a1..73cc09694 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
picture_tab: "Foto"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Sube una imagen"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
admin: "Admin"
new_password: "Nueva contraseña"
new_password_verify: "Verificar"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Suscripciones de correo electrónico"
email_subscriptions_none: "Sin suscripciones de correo electrónico."
email_announcements: "Noticias"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
keyboard_shortcuts: "Atajos de teclado"
space: "Barra espaciadora (Espacio)"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: "Ejecutar código actual."
diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee
index fe6cb9b4c..6260074b2 100644
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
picture_tab: "تصاویر"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee
index 0e439f03a..30a9d5bdb 100644
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
picture_tab: "Kuva"
delete_account_tab: "Poista Tili"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Lataa kuva"
delete_this_account: "Poista tili lopullisesti"
# god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
new_password: "Uusi Salasana"
new_password_verify: "Varmista"
type_in_email: "Anna sähköpostiosoitteesi varmistukseksi"
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Tiedotteet"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
keyboard_shortcuts: "Pikanäppäimet"
space: "Välilyönti"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
run_code: "Suorita koodi."
diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee
index 6b7a7d64d..0a6a4e2dd 100644
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
# retrostyle_blurb: "RetroStyle Games"
teachers:
- title: "CodeCombat pour les enseignants" # {change}
+ title: "CodeCombat pour les enseignants"
intro_1: "CodeCombat est un jeu en ligne qui enseigne la programmation. Les élèves écrivent du code dans de vrais langages de programmation."
intro_2: "Aucune expérience requise !"
free_title: "Combien cela coûte-t-il ?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
picture_tab: "Photos"
delete_account_tab: "Supprimer votre compte"
wrong_email: "Mauvaise adresse e-mail"
+# wrong_password: "Wrong Password"
upload_picture: "Télécharger une image"
delete_this_account: "Supprimer votre compte définitivement"
god_mode: "Puissance Divine"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
new_password: "Nouveau mot de passe"
new_password_verify: "Vérifier"
type_in_email: "Entrez votre adresse e-mail pour confirmer la supression de votre compte"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Abonnements"
email_subscriptions_none: "Aucun e-mail d'abonnement."
email_announcements: "Annonces"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
keyboard_shortcuts: "Raccourcis Clavier"
space: "Espace"
enter: "Entrer"
+# press_enter: "press enter"
escape: "Echap"
shift: "Shift"
run_code: "Exécuter le code actuel."
diff --git a/app/locale/gl.coffee b/app/locale/gl.coffee
index 1dc4ffa7a..4cb67fa60 100644
--- a/app/locale/gl.coffee
+++ b/app/locale/gl.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
picture_tab: "Foto"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Sube unha imaxe"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
admin: "Admin"
new_password: "Novo contrasinal"
new_password_verify: "Verificar"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Suscripcións de correo electrónico"
email_subscriptions_none: "Sen suscripcións de correo electrónico."
email_announcements: "Novas"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
keyboard_shortcuts: "Atallos de teclado"
space: "Barra espaciadora (Espazo)"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/he.coffee b/app/locale/he.coffee
index 2b3a8f306..f366c6c02 100644
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
picture_tab: "תמונה"
delete_account_tab: "מחק את חשבונך"
wrong_email: "כתובת מייל שגויה."
+# wrong_password: "Wrong Password"
upload_picture: "העלה תמונה"
delete_this_account: "מחק את חשבון זה לתמיד"
god_mode: "מצב אל"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
new_password: "סיסמה חדשה"
new_password_verify: "חזור על הסיסמה שנית"
type_in_email: "הזן את כתובת המייל שלך על מנת לבצע את המחיקה"
+# type_in_password: "Also, type in your password."
email_subscriptions: "הרשמויות אימייל"
email_subscriptions_none: ".אין מנויי מייל"
email_announcements: "הודעות"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
keyboard_shortcuts: "קיצורי מקשים"
space: "Space"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: ".הרץ קוד נוכחי"
diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee
index 0e4f9b8ba..297ebcc77 100644
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee
index e74113b6f..224ad4e6b 100644
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
picture_tab: "Kép"
delete_account_tab: "Fiók törlése"
wrong_email: "Rossz email-cím"
+# wrong_password: "Wrong Password"
upload_picture: "Tölts föl egy képet"
delete_this_account: "Fiók végleges törlése"
# god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
new_password: "Új jelszó"
new_password_verify: "Új jelszó megismétlése"
type_in_email: "Írd be az email-címed a törlés megerősítéséhez"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Hírlevél feliratkozások"
email_subscriptions_none: "Nem kérek email értesítéseket."
email_announcements: "Bejelentések"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
keyboard_shortcuts: "Billentyűparancsok"
space: "Szünet"
enter: "Enter"
+# press_enter: "press enter"
escape: "Kilépés"
# shift: "Shift"
run_code: "Aktuális kód futtatása."
diff --git a/app/locale/id.coffee b/app/locale/id.coffee
index a34620738..2c324e1ed 100644
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/it.coffee b/app/locale/it.coffee
index 2631fc4b3..62db971c9 100644
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
picture_tab: "Immagine"
delete_account_tab: "Cancella il tuo account"
wrong_email: "Indirizzo email sbagliato"
+# wrong_password: "Wrong Password"
upload_picture: "Carica immagine"
delete_this_account: "Cancella questo account per sempre"
# god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
new_password: "Nuova password"
new_password_verify: "Verifica"
type_in_email: "Scrivi il tuo indirizzo email per confermare la cancellazione"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Iscrizioni alle email"
email_subscriptions_none: "Nessuna iscrizione."
email_announcements: "Annunci email"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
keyboard_shortcuts: "Scorciatoie da tastiera"
space: "Spazio"
enter: "Invio"
+# press_enter: "press enter"
escape: "Esc"
shift: "Maiusc"
run_code: "Esegui codice attuale."
diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index 97d4836dc..2869927b8 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
picture_tab: "画像"
delete_account_tab: "アカウントの削除"
wrong_email: "間違ったメールアドレス"
+# wrong_password: "Wrong Password"
upload_picture: "画像をアップロード"
delete_this_account: "アカウントを完全削除する"
god_mode: "ゴッドモード"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
new_password: "新パスワード"
new_password_verify: "新パスワードを再入力"
type_in_email: "削除を確認するため、メールを入力して下さい"
+# type_in_password: "Also, type in your password."
email_subscriptions: "ニュースレターの購読"
email_subscriptions_none: "No Email Subscriptions."
email_announcements: "お知らせ"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
keyboard_shortcuts: "キーボードショートカット"
space: "スペース"
enter: "エンター"
+# press_enter: "press enter"
escape: "エスケープ"
shift: "シフト"
run_code: "現在のコードを実行"
diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee
index f4b7fd349..c4d4d6c24 100644
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
picture_tab: "사진"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "사진 업로드"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
admin: "관리자"
new_password: "새 비밀번호"
new_password_verify: "확인(다시한번 입력해주세요)"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "이메일 구독"
email_subscriptions_none: "이메일 구독 안 함"
email_announcements: "공지사항"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
keyboard_shortcuts: "단축키"
space: "스페이스"
enter: "엔터"
+# press_enter: "press enter"
escape: "Esc"
shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee
index 51f0c7eee..490ff548d 100644
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/mk-MK.coffee b/app/locale/mk-MK.coffee
index ddd5ffdac..c3542eb67 100644
--- a/app/locale/mk-MK.coffee
+++ b/app/locale/mk-MK.coffee
@@ -93,13 +93,13 @@ module.exports = nativeDescription: "Македонски", englishDescription:
campaign_classic_algorithms: "Класични алгоритми"
campaign_classic_algorithms_description: "... во кои ги учиш најпопуларните алгоритми во компјутерската наука."
-# share_progress_modal:
-# blurb: "You’re making great progress! Tell your parent how much you've learned with CodeCombat."
-# email_invalid: "Email address invalid."
-# form_blurb: "Enter your parent's email below and we’ll show them!"
-# form_label: "Email Address"
-# placeholder: "email address"
-# title: "Excellent Work, Apprentice"
+ share_progress_modal:
+ blurb: "Одлично напредуваш! Кажи му на родителот колку имаш научено со CodeCombat."
+ email_invalid: "E-mail адресата е невалидна."
+ form_blurb: "Внеси ја e-mail адресата на твојот родител подолу и ние ќе му покажеме!"
+ form_label: "E-mail адреса"
+ placeholder: "e-mail адреса"
+ title: "Одлична работа, чираку"
login:
sign_up: "Направи сметка"
@@ -137,8 +137,8 @@ module.exports = nativeDescription: "Македонски", englishDescription:
books: "Книги"
common:
-# back: "Back" # When used as an action verb, like "Navigate backward"
-# continue: "Continue" # When used as an action verb, like "Continue forward"
+ back: "Врати се" # When used as an action verb, like "Navigate backward"
+ continue: "Продолжи" # When used as an action verb, like "Continue forward"
loading: "Вчитување..."
saving: "Зачувување..."
sending: "Испраќање..."
@@ -158,7 +158,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
# unwatch: "Unwatch"
submit_patch: "Поднеси закрпа"
submit_changes: "Поднеси промени"
-# save_changes: "Save Changes"
+ save_changes: "Зачувај промени"
general:
and: "и"
@@ -167,20 +167,20 @@ module.exports = nativeDescription: "Македонски", englishDescription:
body: "Тело"
version: "Верзија"
# pending: "Pending"
-# accepted: "Accepted"
-# rejected: "Rejected"
-# withdrawn: "Withdrawn"
+ accepted: "Прифатено"
+ rejected: "Одбиено"
+ withdrawn: "Повлечено"
submitter: "Подносител"
submitted: "Поднесено"
commit_msg: "Порака за поднесокот"
-# review: "Review"
+ review: "Проверка"
version_history: "Историја на верзии"
version_history_for: "Историја на верзии за: "
select_changes: "Одбери две промени подолу за да ја видиш разликата."
# undo_prefix: "Undo"
-# undo_shortcut: "(Ctrl+Z)"
+ undo_shortcut: "(Ctrl+Z)"
# redo_prefix: "Redo"
-# redo_shortcut: "(Ctrl+Shift+Z)"
+ redo_shortcut: "(Ctrl+Shift+Z)"
play_preview: "Пушти преглед на моменталното ниво"
result: "Резултат"
results: "Резултати"
@@ -203,10 +203,10 @@ module.exports = nativeDescription: "Македонски", englishDescription:
medium: "Средно"
hard: "Тешко"
player: "Играч"
-# player_level: "Level" # Like player level 5, not like level: Dungeons of Kithgard
-# warrior: "Warrior"
-# ranger: "Ranger"
-# wizard: "Wizard"
+ player_level: "Ниво" # Like player level 5, not like level: Dungeons of Kithgard
+ warrior: "Воин"
+ ranger: "Ренџер"
+ wizard: "Волшебник"
units:
second: "секунда"
@@ -231,12 +231,12 @@ module.exports = nativeDescription: "Македонски", englishDescription:
skip: "Прескокни"
game_menu: "Мени"
guide: "Водич"
-# restart: "Restart"
+ restart: "Почни одново"
goals: "Цели"
goal: "Цел"
-# running: "Running..."
+ running: "Се извршува..."
success: "Успешно!"
- incomplete: "Некомплетирано"
+ incomplete: "Незавршено"
timed_out: "Истече времето"
# failing: "Failing"
# action_timeline: "Action Timeline"
@@ -284,7 +284,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
hud_continue_short: "Продолжи"
code_saved: "Кодот е зачуван"
skip_tutorial: "Прескокни (esc)"
-# keyboard_shortcuts: "Key Shortcuts"
+ keyboard_shortcuts: "Кратенки на тастатурата"
loading_ready: "Готово!"
loading_start: "Почни ниво"
problem_alert_title: "Поправи си го кодот"
@@ -292,9 +292,9 @@ module.exports = nativeDescription: "Македонски", englishDescription:
time_current: "Сега:"
time_total: "Максимум:"
time_goto: "Оди до:"
-# non_user_code_problem_title: "Unable to Load Level"
-# infinite_loop_title: "Infinite Loop Detected"
-# infinite_loop_description: "The initial code to build the world never finished running. It's probably either really slow or has an infinite loop. Or there might be a bug. You can either try running this code again or reset the code to the default state. If that doesn't fix it, please let us know."
+ non_user_code_problem_title: "Неможам да го вчитам нивото"
+ infinite_loop_title: "Забележана е бесконечна јамка"
+ infinite_loop_description: "Првичниот код за изградба на светот никогаш не завршил со своето извршување. Веројатно е, или премногу спор, или соджи бесконечна јамка. Или можеби има грешка. Можеш да се обидеш да го извршиш овој код повторно или да го ресетираш кодот во првичната состојба. Ако тоа не го поправи проблемот, те молиме да не известиш."
# check_dev_console: "You can also open the developer console to see what might be going wrong."
# check_dev_console_link: "(instructions)"
infinite_loop_try_again: "Обиди се повторно"
@@ -339,14 +339,14 @@ module.exports = nativeDescription: "Македонски", englishDescription:
tip_lines_of_code: "Да се мери напредок во програмирање со број на напишани линии код е исто као да се мери напредок при изградба на авион по неговата тежина. — Bill Gates"
tip_source_code: "Сакам да го сменам светот ама не ми го даваат кодот."
tip_javascript_java: "Java е поврзана со JavaScript колку што и тапа е поврзана со тапанар. - Chris Heilmann"
-# tip_move_forward: "Whatever you do, keep moving forward. - Martin Luther King Jr."
-# tip_google: "Have a problem you can't solve? Google it!"
-# tip_adding_evil: "Adding a pinch of evil."
-# tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-# tip_open_source_contribute: "You can help CodeCombat improve!"
-# tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
-# tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus"
-# tip_strong_opponents: "Even the strongest of opponents always has a weakness. - Itachi Uchiha"
+ tip_move_forward: "Што и да правиш, продолжи да одиш напред. - Martin Luther King Jr."
+ tip_google: "Имаш проблем што не можеш да го решиш? Побарај на Google!"
+ tip_adding_evil: "Додавам трошка зло."
+ tip_hate_computers: "Тоа е работата со луѓето кои мислат дека мразат компјутери. Тоа што тие навистина го мразат се лоши програмери. - Larry Niven"
+ tip_open_source_contribute: "Можеш да помогнеш да се подобри CodeCombat!"
+ tip_recurse: "Да работиш итеративно е човечки, а да работич рекурзивно е божествено. - L. Peter Deutsch"
+ tip_free_your_mind: "Мораш да го оставиш сето тоа, Нео. Стравот, сомнежот, и невербата. Ослободи го твојот ум. - Morpheus"
+ tip_strong_opponents: "Дури и најсилниот противник има некоја слаба точка. - Itachi Uchiha"
game_menu:
# inventory_tab: "Inventory"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Македонски", englishDescription:
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Македонски", englishDescription:
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Македонски", englishDescription:
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee
index 868b7e182..eb5d924f5 100644
--- a/app/locale/ms.coffee
+++ b/app/locale/ms.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
picture_tab: "Gambar"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
# admin: "Admin"
new_password: "Kata-laluan baru"
new_password_verify: "Verifikasi"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Pengumuman"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee
index e88a23406..525d14c38 100644
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
picture_tab: "Bilde"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Last opp bilde"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
admin: "Administrator"
new_password: "Nytt Passord"
new_password_verify: "Bekreft passord"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Epost Abonnement"
email_subscriptions_none: "Ingen Epost Abonnement."
email_announcements: "Kunngjøringer"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
keyboard_shortcuts: "Hurtigtaster"
space: "Mellomrom"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: "Kjør koden."
diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee
index d4b2572bc..29967f2e5 100644
--- a/app/locale/nl-BE.coffee
+++ b/app/locale/nl-BE.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
picture_tab: "Afbeelding"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
admin: "Administrator"
new_password: "Nieuw Wachtwoord"
new_password_verify: "Verifieer"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "E-mail Abonnementen"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Aankondigingen"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee
index 3d454ae41..8a919e3a5 100644
--- a/app/locale/nl-NL.coffee
+++ b/app/locale/nl-NL.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
picture_tab: "Afbeelding"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Je afbeelding opsturen"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
admin: "Administrator"
new_password: "Nieuw Wachtwoord"
new_password_verify: "Verifieer"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Email Abonnementen"
email_subscriptions_none: "Geen Email Abonnementen."
email_announcements: "Aankondigingen"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee
index 78a063d00..b39ef66fb 100644
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee
index 32d21040a..783b6a25a 100644
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
picture_tab: "Zdjęcie"
delete_account_tab: "Usuń swoje konto"
wrong_email: "Błędny e-mail"
+# wrong_password: "Wrong Password"
upload_picture: "Wgraj zdjęcie"
delete_this_account: "Usuń to konto całkowicie"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
admin: "Administrator"
new_password: "Nowe hasło"
new_password_verify: "Zweryfikuj"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Powiadomienia email"
email_subscriptions_none: "Brak powiadomień e-mail."
email_announcements: "Ogłoszenia"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
keyboard_shortcuts: "Skróty klawiszowe"
space: "Spacja"
enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee
index 8a06b5748..374b17a02 100644
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
retrostyle_blurb: "Games estilo Retrô"
teachers:
- title: "CodeCombat para Professores" # {change}
+ title: "CodeCombat para Professores"
intro_1: "CodeCombat é um jogo online que ensina programação. Estudantes criam código em linguagens de programação usadas na vida real."
intro_2: "Não é necessário ter experiência!"
free_title: "Quanto custa?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
picture_tab: "Foto"
delete_account_tab: "Excluir sua conta"
wrong_email: "E-mail incorreto"
+# wrong_password: "Wrong Password"
upload_picture: "Enviar uma foto"
delete_this_account: "Excluir essa conta definitivamente"
god_mode: "Modo Deus"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
new_password: "Nova Senha"
new_password_verify: "Confirmação"
type_in_email: "Digite seu e-mail para confirmar a exclusão"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Assinaturas para Notícias por Email"
email_subscriptions_none: "Sem Assinaturas de Email"
email_announcements: "Notícias"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
keyboard_shortcuts: "Atalhos do Teclado"
space: "Espaço"
enter: "Enter"
+# press_enter: "press enter"
escape: "Esc"
shift: "Shift"
run_code: "Rodar código atual."
diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee
index 8d953feaa..9fc99d402 100644
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
must_be_logged: "Primeiro tens de ter sessão iniciada. Por favor, cria uma conta ou inicia sessão a partir do menu acima."
retrieving: "A recolher informações..."
being_reviewed_1: "A tua aplicação para uma subscrição de avaliação gratuita está a ser"
- being_reviewed_2: "revista"
+ being_reviewed_2: "revista."
approved_1: "A tua aplicação para uma subscrição de avaliação gratuita foi"
- approved_2: "aprovada"
+ approved_2: "aprovada."
approved_3: "Mais instruções foram enviadas para"
denied_1: "A tua aplicação para uma subscrição de avaliação gratuita foi"
- denied_2: "recusada"
+ denied_2: "recusada."
contact_1: "Por favor, contacta"
contact_2: "se tiveres mais questões."
description_1: "Oferecemos subscrições gratuitas a professores para efeitos de avaliação. Na nossa página para"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
description_3: "podes encontar muitas mais informações."
description_4: "Por favor, preenche este pequeno inquérito e nós enviar-te-emos, por e-mail, as instruções de configuração."
email: "Endereço de E-mail"
- school_city: "Nome da Escola, Cidade"
+ school: "Nome da Escola"
+ location: "Nome da Cidade"
age_students: "Que idade têm os teus alunos?"
under: "Menos de"
other: "Outra:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
picture_tab: "Fotografia"
delete_account_tab: "Elimina a Tua Conta"
wrong_email: "E-mail Errado"
+ wrong_password: "Palavra-passe Errada"
upload_picture: "Anexar uma fotografia"
delete_this_account: "Elimina esta conta permanentemente"
god_mode: "Modo Deus"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
new_password: "Nova Palavra-passe"
new_password_verify: "Verificar"
type_in_email: "Escreve o teu e-mail para confirmares a eliminação"
+ type_in_password: "Escreve também a tua palavra-passe."
email_subscriptions: "Subscrições de E-mail"
email_subscriptions_none: "Sem Subscições de E-mail."
email_announcements: "Anúncios"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
keyboard_shortcuts: "Atalhos de Teclado"
space: "Espaço"
enter: "Enter"
+ press_enter: "pressiona enter"
escape: "Esc"
shift: "Shift"
run_code: "Executar código atual."
diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee
index 748b732c5..d2417fb4a 100644
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@@ -1,17 +1,17 @@
module.exports = nativeDescription: "limba română", englishDescription: "Romanian", translation:
home:
- slogan: "Învață sa scrii cod jucându-te"
+ slogan: "Învață să scrii cod jucându-te"
no_ie: "CodeCombat nu merge pe Internet Explorer 8 sau mai vechi. Scuze!" # Warning that only shows up in IE8 and older
- no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile si s-ar putea sa nu meargă!" # Warning that shows up on mobile devices
+ no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile şi s-ar putea să nu meargă!" # Warning that shows up on mobile devices
play: "Joacă" # The big play button that opens up the campaign view.
old_browser: "Mda , browser-ul tău este prea vechi pentru CodeCombat. Scuze!" # Warning that shows up on really old Firefox/Chrome/Safari
old_browser_suffix: "Poți să încerci oricum ,dar probabil nu o să meargă."
-# ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval."
+ ipad_browser: "Veşti rele: CodeCombat nu rulează pe iPad in browser. Veşti bune: aplicaţia noastră nativă pentru iPad e în curs de aprobare."
campaign: "Campanie"
for_beginners: "Pentru Începători"
multiplayer: "Multiplayer" # Not currently shown on home page
- for_developers: "Pentru dezvoltatori" # Not currently shown on home page.
-# or_ipad: "Or download for iPad"
+ for_developers: "Pentru Dezvoltatori" # Not currently shown on home page.
+ or_ipad: "Sau descarcă pentru iPad"
nav:
play: "Nivele" # The top nav bar entry where players choose which levels to play
@@ -30,7 +30,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
about: "Despre"
contact: "Contact"
twitter_follow: "Urmărește"
-# teachers: "Teachers"
+ teachers: "Educatori"
modal:
close: "Inchide"
@@ -52,67 +52,67 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
spectate: "Spectator" # Ladder page
players: "jucători" # Hover over a level on /play
hours_played: "ore jucate" # Hover over a level on /play
-# items: "Items" # Tooltip on item shop button from /play
-# unlock: "Unlock" # For purchasing items and heroes
-# confirm: "Confirm"
-# owned: "Owned" # For items you own
-# locked: "Locked"
-# purchasable: "Purchasable" # For a hero you unlocked but haven't purchased
-# available: "Available"
-# skills_granted: "Skills Granted" # Property documentation details
-# heroes: "Heroes" # Tooltip on hero shop button from /play
-# achievements: "Achievements" # Tooltip on achievement list button from /play
-# account: "Account" # Tooltip on account button from /play
-# settings: "Settings" # Tooltip on settings button from /play
-# poll: "Poll" # Tooltip on poll button from /play
-# 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"
-# subscription_required: "Subscription Required"
-# older_campaigns: "Older Campaigns"
-# anonymous: "Anonymous Player"
+ items: "Iteme" # Tooltip on item shop button from /play
+ unlock: "Deblochează" # For purchasing items and heroes
+ confirm: "Confirmă"
+ owned: "Deținute" # For items you own
+ locked: "Blocate"
+ purchasable: "De cumpărat" # For a hero you unlocked but haven't purchased
+ available: "Valabile"
+ skills_granted: "Skill-uri acordate" # Property documentation details
+ heroes: "Eroi" # Tooltip on hero shop button from /play
+ achievements: "Realizări" # Tooltip on achievement list button from /play
+ account: "Cont" # Tooltip on account button from /play
+ settings: "Setări" # Tooltip on settings button from /play
+ poll: "Sondaj" # Tooltip on poll button from /play
+ next: "Următorul" # Go from choose hero to choose inventory before playing a level
+ change_hero: "Schimbă eroul" # Go back from choose inventory to choose hero
+ choose_inventory: "Foloseste Itemele"
+ buy_gems: "Cumpără Pietre Prețioase"
+ subscription_required: "Abonament Necesar"
+ older_campaigns: "Campanii mai vechi"
+ anonymous: "Jucător Anonim"
level_difficulty: "Dificultate: "
campaign_beginner: "Campanie pentru Începători"
-# awaiting_levels_adventurer_prefix: "We release new levels every week."
-# awaiting_levels_adventurer: "Sign up as an Adventurer"
-# awaiting_levels_adventurer_suffix: "to be the first to play new levels."
-# adjust_volume: "Adjust volume"
+ awaiting_levels_adventurer_prefix: "Lansăm niveluri noi în fiecare săptămână."
+ awaiting_levels_adventurer: "Înscrie-te ca un aventurier "
+ awaiting_levels_adventurer_suffix: "pentru a fi primul care joacă nivele noi."
+ adjust_volume: "Reglează volumul"
choose_your_level: "Alege nivelul" # The rest of this section is the old play view at /play-old and isn't very important.
adventurer_prefix: "Poți să sari la orice nivel de mai jos"
adventurer_forum: "forumul Aventurierului"
adventurer_suffix: "."
-# campaign_old_beginner: "Old Beginner Campaign"
+ campaign_old_beginner: "Vechea campanie a începătorului"
campaign_old_beginner_description: "... în care se învață tainele programării."
campaign_dev: "Nivele aleatoare mai grele"
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_multiplayer_description: "... în care te lupți cap-la-cap contra alți jucători."
campaign_player_created: "Create de jucători"
campaign_player_created_description: "... în care ai ocazia să testezi creativitatea colegilor tai Artisan Wizards."
-# campaign_classic_algorithms: "Classic Algorithms"
-# campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science."
+ campaign_classic_algorithms: "Algoritmi clasici"
+ campaign_classic_algorithms_description: "... în care înveți cei mai populari algoritmi în informatică."
-# share_progress_modal:
-# blurb: "You’re making great progress! Tell your parent how much you've learned with CodeCombat."
-# email_invalid: "Email address invalid."
-# form_blurb: "Enter your parent's email below and we’ll show them!"
-# form_label: "Email Address"
-# placeholder: "email address"
-# title: "Excellent Work, Apprentice"
+ share_progress_modal:
+ blurb: "Faci progrese mari! Spune-le părinților cât de mult ai învățat cu CodeCombat."
+ email_invalid: "Adresă Email invalidă."
+ form_blurb: "Introduceți adresa e-mail al unui părinte mai jos și le vom arăta!"
+ form_label: "Adresă Email"
+ placeholder: "adresă email"
+ title: "Excelentă treabă, Ucenicule"
login:
sign_up: "Crează cont"
log_in: "Log In"
logging_in: "Se conectează"
log_out: "Log Out"
-# forgot_password: "Forgot your password?"
-# authenticate_gplus: "Authenticate G+"
-# load_profile: "Load G+ Profile"
-# finishing: "Finishing"
-# sign_in_with_facebook: "Sign in with Facebook"
-# sign_in_with_gplus: "Sign in with G+"
-# signup_switch: "Want to create an account?"
+ forgot_password: "Ai uitat parola?"
+ authenticate_gplus: "Autentificare G+"
+ load_profile: "Încarca cont G+"
+ finishing: "Terminare"
+ sign_in_with_facebook: "Conectați-vă cu Facebook"
+ sign_in_with_gplus: "Conectați-vă cu G+"
+ signup_switch: "Doriți să creați un cont?"
signup:
email_announcements: "Primește notificări prin email"
@@ -121,72 +121,72 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
log_in: "loghează-te cu parola"
social_signup: "Sau, te poți inregistra cu Facebook sau G+:"
required: "Trebuie să te înregistrezi înaite să parcurgi acest drum."
-# login_switch: "Already have an account?"
+ login_switch: "Ai deja un cont?"
recover:
recover_account_title: "Recuperează Cont"
send_password: "Trimite parolă de recuperare"
-# recovery_sent: "Recovery email sent."
+ recovery_sent: "Email de recuperare trimis."
-# items:
-# primary: "Primary"
-# secondary: "Secondary"
-# armor: "Armor"
-# accessories: "Accessories"
-# misc: "Misc"
-# books: "Books"
+ items:
+ primary: "Primar"
+ secondary: "Secundar"
+ armor: "Armură"
+ accessories: "Accesorii"
+ misc: "Diverse"
+ books: "Cărti"
common:
-# back: "Back" # When used as an action verb, like "Navigate backward"
-# continue: "Continue" # When used as an action verb, like "Continue forward"
+ back: "Inapoi" # When used as an action verb, like "Navigate backward"
+ continue: "Continuă" # When used as an action verb, like "Continue forward"
loading: "Se incarcă..."
saving: "Se salvează..."
sending: "Se trimite..."
send: "Trimite"
cancel: "Anulează"
save: "Salvează"
- publish: "Publica"
+ publish: "Publică"
create: "Creează"
manual: "Manual"
fork: "Fork"
play: "Joacă" # When used as an action verb, like "Play next level"
retry: "Reîncearca"
-# actions: "Actions"
-# info: "Info"
-# help: "Help"
-# watch: "Watch"
-# unwatch: "Unwatch"
+ actions: "Acţiuni"
+ info: "Info"
+ help: "Ajutor"
+ watch: "Watch"
+ unwatch: "Unwatch"
submit_patch: "Înainteaza Patch"
-# submit_changes: "Submit Changes"
-# save_changes: "Save Changes"
+ submit_changes: "Trimite modificări"
+ save_changes: "Salveaza modificări"
general:
and: "și"
name: "Nume"
-# date: "Date"
+ date: "Dată"
body: "Corp"
version: "Versiune"
-# pending: "Pending"
-# accepted: "Accepted"
-# rejected: "Rejected"
-# withdrawn: "Withdrawn"
-# submitter: "Submitter"
-# submitted: "Submitted"
+ pending: "În așteptare"
+ accepted: "Acceptat"
+ rejected: "Respins"
+ withdrawn: "Retrage"
+ submitter: "Expeditor"
+ submitted: "Expediat"
commit_msg: "Înregistrează Mesajul"
-# review: "Review"
-# version_history: "Version History"
- version_history_for: "Versiune istorie pentru: "
-# select_changes: "Select two changes below to see the difference."
-# undo_prefix: "Undo"
-# undo_shortcut: "(Ctrl+Z)"
-# redo_prefix: "Redo"
-# redo_shortcut: "(Ctrl+Shift+Z)"
-# play_preview: "Play preview of current level"
+ review: "Revizuie"
+ version_history: "Istoricul versiunilor"
+ version_history_for: "Istoricul versiunilor pentru: "
+ select_changes: "Selectați două schimbări de mai jos pentru a vedea diferenţa."
+ undo_prefix: "Undo"
+ undo_shortcut: "(Ctrl+Z)"
+ redo_prefix: "Redo"
+ redo_shortcut: "(Ctrl+Shift+Z)"
+ play_preview: "Joaca previzualizarea nivelului actual"
result: "Rezultat"
- results: "Resultate"
+ results: "Rezultate"
description: "Descriere"
or: "sau"
-# subject: "Subject"
+ subject: "Subiect"
email: "Email"
password: "Parolă"
message: "Mesaj"
@@ -202,11 +202,11 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
easy: "Ușor"
medium: "Mediu"
hard: "Greu"
-# player: "Player"
-# player_level: "Level" # Like player level 5, not like level: Dungeons of Kithgard
-# warrior: "Warrior"
-# ranger: "Ranger"
-# wizard: "Wizard"
+ player: "Jucător"
+ player_level: "Nivel" # Like player level 5, not like level: Dungeons of Kithgard
+ warrior: "Războinic"
+ ranger: "Arcaș"
+ wizard: "Vrăjitor"
units:
second: "secundă"
@@ -219,7 +219,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
days: "zile"
week: "săptămână"
weeks: "săptămâni"
- month: "luna"
+ month: "lună"
months: "luni"
year: "an"
years: "ani"
@@ -227,79 +227,79 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
play_level:
done: "Gata"
home: "Acasă" # Not used any more, will be removed soon.
-# level: "Level" # Like "Level: Dungeons of Kithgard"
-# skip: "Skip"
+ level: "Nivel" # Like "Level: Dungeons of Kithgard"
+ skip: "Sari peste"
game_menu: "Meniul Jocului"
guide: "Ghid"
restart: "Restart"
goals: "Obiective"
-# goal: "Goal"
-# running: "Running..."
+ goal: "Obiectiv"
+ running: "Rulează..."
success: "Success!"
incomplete: "Incomplet"
- timed_out: "Ai ramas fara timp"
+ timed_out: "Ai rămas fără timp"
failing: "Eşec"
action_timeline: "Timeline-ul acțiunii"
click_to_select: "Apasă pe o unitate pentru a o selecta."
-# control_bar_multiplayer: "Multiplayer"
-# control_bar_join_game: "Join Game"
-# reload: "Reload"
+ control_bar_multiplayer: "Multiplayer"
+ control_bar_join_game: "Alătură-Te Jocului"
+ reload: "Reîncarca"
reload_title: "Reîncarcă tot codul?"
reload_really: "Ești sigur că vrei să reîncarci nivelul de la început?"
- reload_confirm: "Reload All"
-# victory: "Victory"
+ reload_confirm: "Reîncarca Tot"
+ victory: "Victorie"
victory_title_prefix: ""
victory_title_suffix: " Terminat"
victory_sign_up: "Înscrie-te pentru a salva progresul"
victory_sign_up_poke: "Vrei să-ți salvezi codul? Crează un cont gratis!"
victory_rate_the_level: "Apreciază nivelul: " # Only in old-style levels.
victory_return_to_ladder: "Înapoi la jocurile de clasament"
-# victory_play_continue: "Continue"
-# victory_saving_progress: "Saving Progress"
+ victory_play_continue: "Continuă"
+ victory_saving_progress: "Salvează Progresul"
victory_go_home: "Acasă" # Only in old-style levels.
victory_review: "Spune-ne mai multe!" # Only in old-style levels.
victory_hour_of_code_done: "Ai terminat?"
victory_hour_of_code_done_yes: "Da, am terminat Hour of Code™!"
-# victory_experience_gained: "XP Gained"
-# victory_gems_gained: "Gems Gained"
-# victory_new_item: "New Item"
-# victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
-# victory_become_a_viking: "Become a Viking"
+ victory_experience_gained: "Ai câștigat XP"
+ victory_gems_gained: "Ai câștigat Pietre Prețioase"
+ victory_new_item: "Item nou"
+ victory_viking_code_school: "Wow, ăla a fost un nivel greu! Daca nu ești deja un dezvoltator de software, ar trebui să fi. Tocmai ai fost selectat pentru acceptare in Viking Code School, unde poți sa iți dezvolți abilitățile la nivelul următor și să devi un dezvoltator web profesionist în 14 săptămâni."
+ victory_become_a_viking: "Devino Viking"
guide_title: "Ghid"
- tome_minion_spells: "Vrăjile Minion-ilor tăi" # Only in old-style levels.
+ tome_minion_spells: "Vrăjile Minionilor tăi" # Only in old-style levels.
tome_read_only_spells: "Vrăji Read-Only" # Only in old-style levels.
tome_other_units: "Alte unități" # Only in old-style levels.
-# tome_cast_button_run: "Run"
-# tome_cast_button_running: "Running"
-# tome_cast_button_ran: "Ran"
-# tome_submit_button: "Submit"
-# tome_reload_method: "Reload original code for this method" # Title text for individual method reload button.
-# tome_select_method: "Select a Method"
-# tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methods).
+ tome_cast_button_run: "Ruleaza"
+ tome_cast_button_running: "In Derulare"
+ tome_cast_button_ran: "A rulat"
+ tome_submit_button: "Trimite"
+ tome_reload_method: "Reîncarcă cod original, pentru această metodă" # Title text for individual method reload button.
+ tome_select_method: "Selectați o metodă"
+ tome_see_all_methods: "Vezi toate metodele pe care le poți edita" # Title text for method list selector (shown when there are multiple programmable methods).
tome_select_a_thang: "Alege pe cineva pentru "
- tome_available_spells: "Vrăjile disponibile"
-# tome_your_skills: "Your Skills"
-# tome_help: "Help"
-# tome_current_method: "Current Method"
-# hud_continue_short: "Continue"
-# code_saved: "Code Saved"
+ tome_available_spells: "Vrăji disponibile"
+ tome_your_skills: "Skillurile tale"
+ tome_help: "Ajutor"
+ tome_current_method: "Metoda curentă"
+ hud_continue_short: "Continuă"
+ code_saved: "Cod Salvat"
skip_tutorial: "Sari peste (esc)"
keyboard_shortcuts: "Scurtături Keyboard"
loading_ready: "Gata!"
-# loading_start: "Start Level"
-# problem_alert_title: "Fix Your Code"
-# problem_alert_help: "Help"
-# time_current: "Now:"
-# time_total: "Max:"
-# time_goto: "Go to:"
-# non_user_code_problem_title: "Unable to Load Level"
-# infinite_loop_title: "Infinite Loop Detected"
-# infinite_loop_description: "The initial code to build the world never finished running. It's probably either really slow or has an infinite loop. Or there might be a bug. You can either try running this code again or reset the code to the default state. If that doesn't fix it, please let us know."
-# check_dev_console: "You can also open the developer console to see what might be going wrong."
-# check_dev_console_link: "(instructions)"
-# infinite_loop_try_again: "Try Again"
-# infinite_loop_reset_level: "Reset Level"
-# infinite_loop_comment_out: "Comment Out My Code"
+ loading_start: "Începe Level"
+ problem_alert_title: "Repară codul"
+ problem_alert_help: "Ajutor"
+ time_current: "Acum:"
+ time_total: "Max:"
+ time_goto: "Dute la:"
+ non_user_code_problem_title: "Imposibil de încărcat Nivel"
+ infinite_loop_title: "Buclă infinită detectată"
+ infinite_loop_description: "Codul initial pentru a construi lumea nu a terminat de rulat. Este, probabil, foarte lent sau are o buclă infinită. Sau ar putea fi un bug. Puteți încerca acest cod nou sau resetați codul la starea implicită. Dacă nu-l repara, vă rugăm să ne anunțați."
+ check_dev_console: "Puteți deschide, de asemenea, consola de dezvoltator pentru a vedea ce ar putea merge gresit."
+ check_dev_console_link: "(instrucțiuni)"
+ infinite_loop_try_again: "Încearcă din nou"
+ infinite_loop_reset_level: "Resetează Nivelul"
+ infinite_loop_comment_out: "Comentează Codul"
tip_toggle_play: "Pune sau scoate pauza cu Ctrl+P."
tip_scrub_shortcut: "Înapoi și derulare rapidă cu Ctrl+[ and Ctrl+]." # {change}
tip_guide_exists: "Apasă pe ghidul din partea de sus a pagini pentru informații utile."
@@ -313,243 +313,243 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
tip_baby_coders: "În vitor până și bebelușii vor fi Archmage."
tip_morale_improves: "Se va încărca până până când va crește moralul."
tip_all_species: "Noi credem în șanse egale de a învăța programare pentru toate speciile."
- tip_reticulating: "Reticulating spines."
+ tip_reticulating: "Reticulăm coloane vertebrale."
tip_harry: "Ha un Wizard, "
- tip_great_responsibility: "With great coding skill comes great debug responsibility."
-# tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
-# tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
-# tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-# tip_no_try: "Do. Or do not. There is no try. - Yoda"
- tip_patience: "Să ai rabdare trebuie, tinere Padawan. - Yoda"
-# tip_documented_bug: "A documented bug is not a bug; it is a feature."
-# tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
-# tip_talk_is_cheap: "Talk is cheap. Show me the code. - Linus Torvalds"
-# tip_first_language: "The most disastrous thing that you can ever learn is your first programming language. - Alan Kay"
-# tip_hardware_problem: "Q: How many programmers does it take to change a light bulb? A: None, it's a hardware problem."
-# tip_hofstadters_law: "Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law."
-# tip_premature_optimization: "Premature optimization is the root of all evil. - Donald Knuth"
-# tip_brute_force: "When in doubt, use brute force. - Ken Thompson"
-# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..."
-# tip_superpower: "Coding is the closest thing we have to a superpower."
-# tip_control_destiny: "In real open source, you have the right to control your own destiny. - Linus Torvalds"
-# tip_no_code: "No code is faster than no code."
-# tip_code_never_lies: "Code never lies, comments sometimes do. — Ron Jeffries"
-# tip_reusable_software: "Before software can be reusable it first has to be usable."
-# tip_optimization_operator: "Every language has an optimization operator. In most languages that operator is ‘//’"
-# tip_lines_of_code: "Measuring programming progress by lines of code is like measuring aircraft building progress by weight. — Bill Gates"
-# tip_source_code: "I want to change the world but they would not give me the source code."
-# tip_javascript_java: "Java is to JavaScript what Car is to Carpet. - Chris Heilmann"
-# tip_move_forward: "Whatever you do, keep moving forward. - Martin Luther King Jr."
-# tip_google: "Have a problem you can't solve? Google it!"
-# tip_adding_evil: "Adding a pinch of evil."
-# tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
-# tip_open_source_contribute: "You can help CodeCombat improve!"
-# tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
-# tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus"
-# tip_strong_opponents: "Even the strongest of opponents always has a weakness. - Itachi Uchiha"
+ tip_great_responsibility: "Cu o mare abilitate mare de programare vine o mare responsabilitate de debugging."
+ tip_munchkin: "Daca nu iți mananci legumele, un munchkin va veni după tine cand dormi."
+ tip_binary: "Sunt doar 10 tipuri de oameni in lume: cei ce îteleg sistemul binar, si ceilalți."
+ tip_commitment_yoda: "Un programator trebuie să aiba cel mai profund angajament, si mintea cea mai serioasă. ~Yoda"
+ tip_no_try: "Fă. Sau nu mai face. Nu exista voi încerca. ~Yoda"
+ tip_patience: "Să ai rabdare trebuie, tinere Padawan. ~Yoda"
+ tip_documented_bug: "Un bug documentat nu e chiar un bug; este o caracteristica."
+ tip_impossible: "Mereu pare imposibil până e gata. ~Nelson Mandela"
+ tip_talk_is_cheap: "Vorbele sunt ieftine. Arată-mi codul. ~Linus Torvalds"
+ tip_first_language: "Cel mai dezastruos lucru pe care poți să îl înveți este primul limbaj de programare. ~Alan Kay"
+ tip_hardware_problem: "Î: De cați programatori ai nevoie ca să schimbi un bec? R: Niciunul, e o problemă hardware."
+ tip_hofstadters_law: "Legea lui Hofstadter: Mereu dureaza mai mult decât te aștepți, chiar dacă iei în considerare Legea lui Hofstadter."
+ tip_premature_optimization: "Optimizarea prematură este rădăcina tuturor răutăților. ~Donald Knuth"
+ tip_brute_force: "Atunci cănd ești în dubii, folosește brute force. ~Ken Thompson"
+ tip_extrapolation: "Există două feluri de oameni: cei care pot extrapola din date incomplete..."
+ tip_superpower: "Programarea este cel mai apropiat lucru de o superputere."
+ tip_control_destiny: "In open source, ai dreptul de a-ți controla propiul destin. ~Linus Torvalds"
+ tip_no_code: "Nici-un cod nu e mai rapid decat niciun cod."
+ tip_code_never_lies: "Codul nu minte niciodată, commenturile mai mint. ~Ron Jeffries"
+ tip_reusable_software: "Înainte ca un software să fie reutilizabil, trebuie să fie mai întâi utilizabil."
+ tip_optimization_operator: "Fiecare limbaj are un operator de optimizare. La majoritatea acela este '//'"
+ tip_lines_of_code: "Măsurarea progresului în lini de cod este ca și măsurarea progresului de construcție a aeronavelor în greutate. ~Bill Gates"
+ tip_source_code: "Vreau să schimb lumea dar nu îmi dă nimeni codul sursă."
+ tip_javascript_java: "Java e pentru JavaScript exact ce e o Mașina pentru o Carpetă. ~Chris Heilmann"
+ tip_move_forward: "Orice ai face, dăi înainte. ~Martin Luther King Jr."
+ tip_google: "Ai o problemă care nu o poți rezolva? Folosește Google!"
+ tip_adding_evil: "Adaugăm un strop de răutate."
+ tip_hate_computers: "Tocmai aia e problema celor ce urăsc calulatoarele, ei defapt urăsc programatorii nepricepuți. ~Larry Niven"
+ tip_open_source_contribute: "Poți ajuta la îmbunătățirea jocului CodeCombat!"
+ tip_recurse: "A itera este uman, recursiv este divin. ~L. Peter Deutsch"
+ tip_free_your_mind: "Trebuie sa lași totul, Neo. Frica, Îndoiala și necredința. Eliberează-ți mintea. ~Morpheus"
+ tip_strong_opponents: "Și cei mai puternici dintre oponenți întodeauna au o slăbiciune. ~Itachi Uchiha"
game_menu:
-# inventory_tab: "Inventory"
-# save_load_tab: "Save/Load"
-# options_tab: "Options"
-# guide_tab: "Guide"
-# guide_video_tutorial: "Video Tutorial"
-# guide_tips: "Tips"
+ inventory_tab: "Inventar"
+ save_load_tab: "Salvează/Încarcă"
+ options_tab: "Opțiuni"
+ guide_tab: "Ghid"
+ guide_video_tutorial: "Tutorial Video"
+ guide_tips: "Sfaturi"
multiplayer_tab: "Multiplayer"
-# auth_tab: "Sign Up"
-# inventory_caption: "Equip your hero"
-# choose_hero_caption: "Choose hero, language"
-# save_load_caption: "... and view history"
+ auth_tab: "Înscriete"
+ inventory_caption: "Echipeazăți Eroul"
+ choose_hero_caption: "Alege Eroul, limbajul"
+ save_load_caption: "... și vezi istoricul"
options_caption: "Configurarea setărilor"
guide_caption: "Documentație si sfaturi"
multiplayer_caption: "Joaca cu prieteni!"
-# auth_caption: "Save your progress."
+ auth_caption: "Salvează progresul."
-# leaderboard:
-# leaderboard: "Leaderboard"
-# view_other_solutions: "View Leaderboards"
-# scores: "Scores"
-# top_players: "Top Players by"
-# day: "Today"
-# week: "This Week"
-# all: "All-Time"
-# time: "Time"
-# damage_taken: "Damage Taken"
-# damage_dealt: "Damage Dealt"
-# difficulty: "Difficulty"
-# gold_collected: "Gold Collected"
+ leaderboard:
+ leaderboard: "Tabel Clasificare"
+ view_other_solutions: "Vizualizează Tabelul de Clasificare"
+ scores: "Scoruri"
+ top_players: "Top Jucători"
+ day: "Astăzi"
+ week: "Săptămâna Aceasta"
+ all: "Tot Timpul"
+ time: "Timp"
+ damage_taken: "Damage Primit"
+ damage_dealt: "Damage Oferit"
+ difficulty: "Dificultate"
+ gold_collected: "Aur Colectat"
-# inventory:
-# choose_inventory: "Equip Items"
-# equipped_item: "Equipped"
-# required_purchase_title: "Required"
-# available_item: "Available"
-# restricted_title: "Restricted"
-# should_equip: "(double-click to equip)"
-# equipped: "(equipped)"
-# locked: "(locked)"
-# restricted: "(restricted in this level)"
-# equip: "Equip"
-# unequip: "Unequip"
+ inventory:
+ choose_inventory: "Echipează Iteme"
+ equipped_item: "Echipat"
+ required_purchase_title: "Necesar"
+ available_item: "Valabil"
+ restricted_title: "Restricționat"
+ should_equip: "(dublu-click pentru echipare)"
+ equipped: "(echipat)"
+ locked: "(blocat)"
+ restricted: "(în acest nivel)"
+ equip: "Echipează"
+ unequip: "Dezechipează"
-# buy_gems:
-# few_gems: "A few gems"
-# pile_gems: "Pile of gems"
-# chest_gems: "Chest of gems"
-# purchasing: "Purchasing..."
-# declined: "Your card was declined"
-# retrying: "Server error, retrying."
-# prompt_title: "Not Enough Gems"
-# prompt_body: "Do you want to get more?"
-# prompt_button: "Enter Shop"
-# recovered: "Previous gems purchase recovered. Please refresh the page."
-# price: "x3500 / mo"
+ buy_gems:
+ few_gems: "Căteva Pietre Prețioase"
+ pile_gems: "Un morman de Pietre Prețioase"
+ chest_gems: "Un cufăr de Pietre Prețioase"
+ purchasing: "Cumpărare..."
+ declined: "Cardul tău a fost refuzat."
+ retrying: "Eroare de server, reîncerc."
+ prompt_title: "Nu sunt destule Pietre Prețioase."
+ prompt_body: "Vrei mai multe?"
+ prompt_button: "Intră în magazin."
+ recovered: "Pietre Prețioase cumpărate anterior recuperate.Va rugăm să dați refresh la pagină."
+ price: "x3500 / mo"
-# subscribe:
-# comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
-# feature1: "80+ basic levels across 4 worlds"
-# feature2: "7 powerful new heroes with unique skills!"
-# feature3: "60+ bonus levels"
-# feature4: "3500 bonus gems every month!"
-# feature5: "Video tutorials"
-# feature6: "Premium email support"
-# feature7: "Private Clans"
-# free: "Free"
-# month: "month"
-# subscribe_title: "Subscribe"
-# unsubscribe: "Unsubscribe"
-# confirm_unsubscribe: "Confirm Unsubscribe"
-# never_mind: "Never Mind, I Still Love You"
-# thank_you_months_prefix: "Thank you for supporting us these last"
-# thank_you_months_suffix: "months."
-# thank_you: "Thank you for supporting CodeCombat."
-# sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better."
-# unsubscribe_feedback_placeholder: "O, what have we done?"
-# parent_button: "Ask your parent"
-# parent_email_description: "We'll email them so they can buy you a CodeCombat subscription."
-# parent_email_input_invalid: "Email address invalid."
-# parent_email_input_label: "Parent email address"
-# parent_email_input_placeholder: "Enter parent email"
-# parent_email_send: "Send Email"
-# parent_email_sent: "Email sent!"
-# parent_email_title: "What's your parent's email?"
-# parents: "For Parents"
-# parents_title: "Dear Parent: Your child is learning to code. Will you help them continue?"
-# parents_blurb1: "Your child has played __nLevels__ levels and learned programming basics. Help cultivate their interest and buy them a subscription so they can keep playing."
-# parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
-# parents_blurb2: "For $9.99 USD/mo, your child will get new challenges every week and personal email support from professional programmers."
-# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
-# payment_methods: "Payment Methods"
-# payment_methods_title: "Accepted Payment Methods"
-# payment_methods_blurb1: "We currently accept credit cards and Alipay."
-# payment_methods_blurb2: "If you require an alternate form of payment, please contact"
-# stripe_description: "Monthly Subscription"
-# subscription_required_to_play: "You'll need a subscription to play this level."
-# unlock_help_videos: "Subscribe to unlock all video tutorials."
-# personal_sub: "Personal Subscription" # Accounts Subscription View below
-# loading_info: "Loading subscription information..."
-# managed_by: "Managed by"
-# will_be_cancelled: "Will be cancelled on"
-# currently_free: "You currently have a free subscription"
-# currently_free_until: "You currently have a free subscription until"
-# was_free_until: "You had a free subscription until"
-# managed_subs: "Managed Subscriptions"
-# managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-# managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-# group_discounts: "Group discounts"
-# group_discounts_1: "We also offer group discounts for bulk subscriptions."
-# group_discounts_1st: "1st subscription"
-# group_discounts_full: "Full price"
-# group_discounts_2nd: "Subscriptions 2-11"
-# group_discounts_20: "20% off"
-# group_discounts_12th: "Subscriptions 12+"
-# group_discounts_40: "40% off"
-# subscribing: "Subscribing..."
-# recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-# subscribe_users: "Subscribe Users"
-# users_subscribed: "Users subscribed:"
-# no_users_subscribed: "No users subscribed, please double check your email addresses."
-# current_recipients: "Current Recipients"
-# unsubscribing: "Unsubscribing..."
-# subscribe_prepaid: "Click Subscribe to use prepaid code"
-# using_prepaid: "Using prepaid code for monthly subscription"
+ subscribe:
+ comparison_blurb: "Îmbunătățeșteți abilitățile cu abonamentul CodeCombat"
+ feature1: "80+ de nivele de bază în 4 lumi diferite!"
+ feature2: "7 Eroi Noi puternici, cu skilluri unice!"
+ feature3: "60+ nivele bonus"
+ feature4: "3500 de Pietre Prețioase bonus în fiecare lună!"
+ feature5: "Tutoriale Video"
+ feature6: "Suport e-mail premium"
+ feature7: "Clanuri private"
+ free: "Gratuit"
+ month: "lună"
+ subscribe_title: "Abonează-te"
+ unsubscribe: "Dezabonează-te"
+ confirm_unsubscribe: "Confirmă Dezabonarea"
+ never_mind: "Nu contează, eu tot te iubesc!"
+ thank_you_months_prefix: "Mulțumesc pentru sprijinul acordat în aceste"
+ thank_you_months_suffix: "luni."
+ thank_you: "Mulțumim pentru susținerea jocului CodeCombat!"
+ sorry_to_see_you_go: "Ne pare rău ca pleci! Te rugăm să ne spui ce am fi putut face mai bine."
+ unsubscribe_feedback_placeholder: "O, ce am făcut?"
+ parent_button: "Întreabă un părinte"
+ parent_email_description: "Le vom trimite un email ca să vă cumpere un abonament CodeCombat"
+ parent_email_input_invalid: "Adresă e-mail invalidă"
+ parent_email_input_label: "Adresa e-mail a unui părinte"
+ parent_email_input_placeholder: "Introduceți e-mail părinte"
+ parent_email_send: "Trimite Email"
+ parent_email_sent: "Email trimis!"
+ parent_email_title: "Care este e-mailul părintelui tău?"
+ parents: "Pentru Părinți"
+ parents_title: "Dragă Părinte: Copilul tău învață programare. Vrei să îl ajuți să continue?"
+ parents_blurb1: "Copilul tău a jucat __nLevels__ nivele și a învățat bazele programări. Ajutăl și cultivă interesul cumpărând un abonament ca să joace în continuare."
+ parents_blurb1a: "Programarea unui computer este o abilitate esențială pe care copilul dumneavoastră o va folosi fără îndoială ca adult. Până in 2020, va fi nevoie de abilități de software de bază de 77% din locurile de muncă, și ingineri software sunt în cerere mare în întreaga lume. Știați că Informatica este gradul universitar cel mai bine plătit?"
+ parents_blurb2: "Pentru $9.99 USD/lună, copilul tău va primi provocări noi în fiecare săptămână și ajutor personal pe e-mail de la programatori profesioniști."
+ parents_blurb3: "Fără Riscuri: Garanție 100% bani înapoi, o dezabonare ușoară cu 1-click."
+ payment_methods: "Metode de plată"
+ payment_methods_title: "Metode de plată acceptate"
+ payment_methods_blurb1: "Deocamdată acceptăm numai cărti de credit si Alipay."
+ payment_methods_blurb2: "Dacă aveți nevoie de o formă alternativă de plată, vă rugăm să ne contactați"
+ stripe_description: "Abonament Lunar"
+ subscription_required_to_play: "Ai nevoie de abonament ca să joci acest nivel."
+ unlock_help_videos: "Abonează-te pentru deblocarea tuturor tutorialelor video."
+ personal_sub: "Abonament Personal" # Accounts Subscription View below
+ loading_info: "Se încarcă informațile despre abonament..."
+ managed_by: "Gestionat de"
+ will_be_cancelled: "Va fi anulat pe"
+ currently_free: "Ai un abonament gratuit"
+ currently_free_until: "Ai un abonament gratuit până pe"
+ was_free_until: "Ai avut un abonament gratuit până pe"
+ managed_subs: "Abonamente Gestionate"
+ managed_subs_desc: "Adaugă abonamente pentru alți jucători (studenți, copii, etc.)"
+ managed_subs_desc_2: "Recipienți trebuie să aibă un cont CodeCombat associat cu adresa e-mail oferită."
+ group_discounts: "Discount pentru Grupuri"
+ group_discounts_1: "De asemenea, oferim reduceri de grup pentru abonamente în vrac."
+ group_discounts_1st: "Primul Abonament"
+ group_discounts_full: "Preț Intreg"
+ group_discounts_2nd: "2-11 abonamente"
+ group_discounts_20: "20% reducere"
+ group_discounts_12th: "12+ abonamente"
+ group_discounts_40: "40% reducere"
+ subscribing: "Te abonăm..."
+ recipient_emails_placeholder: "Introduceți adresa de email ca să vă abonăm, una pe fiecare linie."
+ subscribe_users: "Abonați Userii"
+ users_subscribed: "Useri abonați:"
+ no_users_subscribed: "Nici-un user abonat, verificațî adresele e-mail."
+ current_recipients: "Recipienți curenți"
+ unsubscribing: "Te Dezabonăm..."
+ subscribe_prepaid: "Dăi Click pe Abonare pentru a folosi un cod prepaid"
+ using_prepaid: "Folosesc codul prepaid pentru un abonament lunar"
choose_hero:
-# choose_hero: "Choose Your Hero"
-# programming_language: "Programming Language"
-# programming_language_description: "Which programming language do you want to use?"
-# default: "Default"
-# experimental: "Experimental"
+ choose_hero: "Alege Eroul"
+ programming_language: "Limbaj de Programare"
+ programming_language_description: "Ce limbaj de programare vrei să folosești?"
+ default: "Implicit"
+ experimental: "Experimental"
python_blurb: "Simplu dar puternic, Python este un limbaj de uz general extraordinar!"
javascript_blurb: "Limbajul web-ului."
- coffeescript_blurb: "JavaScript cu o syntaxă mai placută! Nicer JavaScript syntax."
+ coffeescript_blurb: "JavaScript cu o syntaxă mai placută!"
clojure_blurb: "Un Lisp modern."
lua_blurb: "Limbaj de scripting pentru jocuri."
io_blurb: "Simplu dar obscur."
-# status: "Status"
-# hero_type: "Type"
-# weapons: "Weapons"
-# weapons_warrior: "Swords - Short Range, No Magic"
-# weapons_ranger: "Crossbows, Guns - Long Range, No Magic"
-# weapons_wizard: "Wands, Staffs - Long Range, Magic"
-# attack: "Damage" # Can also translate as "Attack"
-# health: "Health"
-# speed: "Speed"
-# regeneration: "Regeneration"
-# range: "Range" # As in "attack or visual range"
-# blocks: "Blocks" # As in "this shield blocks this much damage"
-# backstab: "Backstab" # As in "this dagger does this much backstab damage"
-# skills: "Skills"
-# attack_1: "Deals"
-# attack_2: "of listed"
-# attack_3: "weapon damage."
-# health_1: "Gains"
-# health_2: "of listed"
-# health_3: "armor health."
-# speed_1: "Moves at"
-# speed_2: "meters per second."
-# available_for_purchase: "Available for Purchase" # Shows up when you have unlocked, but not purchased, a hero in the hero store
-# level_to_unlock: "Level to unlock:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
-# restricted_to_certain_heroes: "Only certain heroes can play this level."
+ status: "Stare"
+ hero_type: "Tip"
+ weapons: "Armament"
+ weapons_warrior: "Săbii - Distanță Scurtă, Fără Magie"
+ weapons_ranger: "Arbalete, Arme - Distanță Mare, Fără Magie"
+ weapons_wizard: "Baghete, Toiage, - Distanță Mare, Și Magie"
+ attack: "Attack" # Can also translate as "Attack"
+ health: "Viață"
+ speed: "Viteză"
+ regeneration: "Regenerare"
+ range: "Rază" # As in "attack or visual range"
+ blocks: "Blochează" # As in "this shield blocks this much damage"
+ backstab: "Înjunghiere" # As in "this dagger does this much backstab damage"
+ skills: "Skilluri"
+ attack_1: "Oferă"
+ attack_2: ""
+ attack_3: "Damage cu arma."
+ health_1: "Primește"
+ health_2: ""
+ health_3: "Armură."
+ speed_1: "Se mișcă cu"
+ speed_2: "metri pe secundă."
+ available_for_purchase: "Disponibil pentru cumpărare" # Shows up when you have unlocked, but not purchased, a hero in the hero store
+ level_to_unlock: "Pentru deblocare termină nivelul:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
+ restricted_to_certain_heroes: "Numai anumiți eroi pot juca acest nivel"
-# skill_docs:
-# writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this
-# read_only: "read-only"
-# action_name: "name"
-# action_cooldown: "Takes"
-# action_specific_cooldown: "Cooldown"
-# action_damage: "Damage"
-# action_range: "Range"
-# action_radius: "Radius"
-# action_duration: "Duration"
-# example: "Example"
-# ex: "ex" # Abbreviation of "example"
-# current_value: "Current Value"
-# default_value: "Default value"
-# parameters: "Parameters"
-# returns: "Returns"
-# granted_by: "Granted by"
+ skill_docs:
+ writable: "permisiuni de scriere" # Hover over "attack" in Your Skills while playing a level to see most of this
+ read_only: "permisiuni doar de citire"
+ action_name: "nume"
+ action_cooldown: "Ține"
+ action_specific_cooldown: "Cooldown"
+ action_damage: "Damage"
+ action_range: "Rază de acțiune"
+ action_radius: "Rază"
+ action_duration: "Durată"
+ example: "Exemplu"
+ ex: "ex" # Abbreviation of "example"
+ current_value: "Valoare Curentă"
+ default_value: "Valoare Implicită"
+ parameters: "Parametrii"
+ returns: "Întoarce"
+ granted_by: "Acordat de"
-# save_load:
-# granularity_saved_games: "Saved"
-# granularity_change_history: "History"
+ save_load:
+ granularity_saved_games: "Salvate"
+ granularity_change_history: "Istoric"
options:
-# general_options: "General Options" # Check out the Options tab in the Game Menu while playing a level
-# volume_label: "Volume"
-# music_label: "Music"
-# music_description: "Turn background music on/off."
+ general_options: "Opțiuni Generale" # Check out the Options tab in the Game Menu while playing a level
+ volume_label: "Volum"
+ music_label: "Muzică"
+ music_description: "Oprește Muzica din fundal."
editor_config: "Editor Config"
editor_config_title: "Configurare Editor"
-# editor_config_level_language_label: "Language for This Level"
-# editor_config_level_language_description: "Define the programming language for this particular level."
-# editor_config_default_language_label: "Default Programming Language"
-# editor_config_default_language_description: "Define the programming language you want to code in when starting new levels."
+ editor_config_level_language_label: "Limbajul pentru acest nivel"
+ editor_config_level_language_description: "Definește limbajul de programare pentru acest nivel."
+ editor_config_default_language_label: "Limbajul de Programare Implicit"
+ editor_config_default_language_description: "Definește limbajul de programare în care vrei să scri codul când începi un nivel nou."
editor_config_keybindings_label: "Mapare taste"
- editor_config_keybindings_default: "Default (Ace)"
- editor_config_keybindings_description: "Adaugă comenzi rapide suplimentare cunoscute din editoarele obisnuite."
-# editor_config_livecompletion_label: "Live Autocompletion"
-# editor_config_livecompletion_description: "Displays autocomplete suggestions while typing."
+ editor_config_keybindings_default: "Implicit (Ace)"
+ editor_config_keybindings_description: "Adaugă comenzi rapide suplimentare, cunoscute din editoarele obisnuite."
+ editor_config_livecompletion_label: "Autocompletare Live"
+ editor_config_livecompletion_description: "Afișează sugesti de autocompletare în timp ce scri."
editor_config_invisibles_label: "Arată etichetele invizibile"
editor_config_invisibles_description: "Arată spațiile și taburile invizibile."
editor_config_indentguides_label: "Arată ghidul de indentare"
@@ -564,13 +564,13 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
why_paragraph_2_italic: "wow o insignă"
why_paragraph_2_center: "ci"
why_paragraph_2_italic_caps: "TREBUIE SĂ TERMIN ACEST NIVEL!"
- why_paragraph_2_suffix: "De aceea CodeCombat este un joc multiplayer, nu un curs transfigurat în joc. Nu ne vom opri până când tu nu te poți opri--și de data asta, e de bine."
+ why_paragraph_2_suffix: "De aceea CodeCombat este un joc multiplayer, nu un curs transfigurat în joc. Nu ne vom opri până când tu nu te mai poți opri--dar de data asta, e de bine."
why_paragraph_3: "Dacă e să devi dependent de vreun joc, devino dependent de acesta și fi un vrăjitor al noii ere tehnologice."
-# press_title: "Bloggers/Press"
-# 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_link: "press packet"
-# press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
-# team: "Team"
+ press_title: "Bloggeri/Presă"
+ press_paragraph_1_prefix: "Vrei să scri despre noi? Poți să folosești toate resursele incluse în:"
+ press_paragraph_1_link: "pachetul pentru presă"
+ press_paragraph_1_suffix: ". Toate logourile si imaginile pot fi folosite fără să ne contactezi direct."
+ team: "Echipa"
# george_title: "Cofounder"
# george_blurb: "Businesser"
# scott_title: "Cofounder"
@@ -590,88 +590,89 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
# retrostyle_title: "Illustration"
# retrostyle_blurb: "RetroStyle Games"
-# teachers:
-# title: "CodeCombat: Info for Teachers"
-# intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-# intro_2: "No experience required!"
-# free_title: "How much does it cost?"
-# cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-# free_1: "There are 80+ FREE levels which cover every concept."
-# free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-# teacher_subs_title: "Teachers get free subscriptions!"
-# teacher_subs_1: "Please fill out our"
-# teacher_subs_2: "Teacher Survey"
-# teacher_subs_3: "to set up your subscription."
-# sub_includes_title: "What is included in the subscription?"
-# sub_includes_1: "In addition to the 80+ basic levels, students with a monthly subscription get access to these additional features:"
-# sub_includes_2: "60+ practice levels"
-# sub_includes_3: "Video tutorials"
-# sub_includes_4: "Premium email support"
-# sub_includes_5: "7 new heroes with unique skills to master"
-# sub_includes_6: "3500 bonus gems every month"
-# sub_includes_7: "Private Clans"
-# monitor_progress_title: "How do I monitor student progress?"
-# monitor_progress_1: "Student progress can be monitored by creating a"
-# monitor_progress_2: "for your class."
-# monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-# monitor_progress_4: "page."
-# monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-# private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-# private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-# private_clans_3: "."
-# who_for_title: "Who is CodeCombat for?"
-# who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-# who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-# material_title: "How much material is there?"
-# material_china: "Approximately 30 hours of gameplay spread over 140+ subscriber-only levels so far, with new levels every week."
-# material_1: "Approximately 10 hours of free content and an additional 20 hours of subscriber content, with new levels every week."
-# concepts_title: "What concepts are covered?"
-# how_much_title: "How much does a monthly subscription cost?"
-# how_much_1: "A"
-# how_much_2: "monthly subscription"
-# how_much_3: "costs $9.99, and can be cancelled anytime."
-# how_much_4: "Additionally, we provide discounts for larger groups:"
-# how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school. Please contact"
-# how_much_6: "for more details."
-# more_info_title: "Where can I find more information?"
-# more_info_1: "Our"
-# more_info_2: "teachers forum"
-# more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
-# sys_requirements_title: "System Requirements"
-# sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
-# sys_requirements_2: "CodeCombat is not supported on iPad yet."
+ teachers:
+ title: "CodeCombat: Info pentru Educatori"
+ intro_1: "CodeCombat este un joc online care te învață programare. Studenți scriu cod în limbaje de programare reale."
+ intro_2: "Nu este nevoie de experiența în domeniu!"
+ free_title: "Cât de mult costă?"
+ cost_china: "CodeCombat în China este gratis pentru primele 5 nivele, după care costă $9.99 USD pe lună pentru a accesa celelalte 140+ nivele pe serverele noaste exlusive din China."
+ free_1: "Sunt 80+ de nivele GRATIS ce parcurg fiecare concept în programare."
+ free_2: "Un abonament lunar oferă acces la tutoriale video si nivele extra pentru practică."
+ teacher_subs_title: "Educatori primesc abonamente gratuite!"
+ teacher_subs_1: "Te rugăm sa completezi"
+ teacher_subs_2: "Chestionarul Educatorului"
+ teacher_subs_3: "pentru a configura abonamentul."
+ sub_includes_title: "Ce e inclus în abonament?"
+ sub_includes_1: "Pe langă 80+ de nivele de bază, studenții cu un abonament lunar au acces la aceste servicii suplimentare:"
+ sub_includes_2: "60+ nivele pentru practică"
+ sub_includes_3: "Tutoriale Video"
+ sub_includes_4: "Suport pe e-mail premium"
+ sub_includes_5: "7 eroi noi cu abilități unice de stăpânit"
+ sub_includes_6: "3500 de Pietre Prețioase bonus in fiecare lună"
+ sub_includes_7: "Clanuri Private"
+ monitor_progress_title: "Cum monitorizez progresul unui student?"
+ monitor_progress_1: "Progresul poate fi urmărit creând"
+ monitor_progress_2: "pentru clasa ta."
+ monitor_progress_3: "Pentru a adăuga un student, trimite o invitație în Clanul tău, care este pe"
+ monitor_progress_4: "pagină."
+ monitor_progress_5: "După ce se alătură, vei vedea un rezumat cu progresul studentului pe pagina Clanului tău."
+ private_clans_1: "Clanurile Private oferă intimitate si informați despre progres detaliate pentru fiecare student."
+ private_clans_2: "Pentru a crea un Clan privat, verifică caseta \"Fă Clanul Privat\" când creezi un"
+ private_clans_3: "."
+ who_for_title: "Pentru cine este CodeCombat?"
+ who_for_1: "Recomandăm CodeCombat pentru studenți cu vârsta de la 9 ani în sus. Nu este nevoie de experiență de programare."
+ who_for_2: "Am proiectat CodeCombat pentru a atrage atât băieți cat si fete."
+ material_title: "Cât de mult material conține?"
+ material_china: "Aproximativ 30 de ore de gameplay răspândite peste 140+ de nivele pentru abonați, si nivele noi în fiecare săptămână."
+ material_1: "Aproximativ 10 ore de material gratis si adițional 20 de ore în plus pentru abonați, cu nivele noi în fiecare săptămână."
+ concepts_title: "Ce concepte sunt parcurse?"
+ how_much_title: "Cât de mult costă un abonament lunar?"
+ how_much_1: "Un"
+ how_much_2: "Abonament Lunar"
+ how_much_3: "costă $9.99, și poate fi anulat oricând."
+ how_much_4: "Adițional, oferim discount-uri pentru grupui mari:"
+ how_much_5: "Acceptăm achiziții unice, si abonamente anuale pentru grupuri, cum ar fi o clasă de elevi, toate cu discount. Contactați-ne"
+ how_much_6: "pentru mai multe detalii."
+ more_info_title: "Unde găsesc mai multe informații?"
+ more_info_1: ""
+ more_info_2: "Forumul de educatori"
+ more_info_3: "este un loc bun pentru a vă conecta cu colegii educatori ce folosesc CodeCombat."
+ sys_requirements_title: "Cerințe de Sistem"
+ sys_requirements_1: "Un browser modern. Versiuni mai noi de Chrome, Firefox, sau Safari. Internet Explorer 9 sau o versiune mai nouă."
+ sys_requirements_2: "CodeCombat nu funcționează pe iPad încă"
-# teachers_survey:
-# title: "Teacher Survey"
-# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
-# retrieving: "Retrieving information..."
-# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
-# approved_1: "Your application for a free trial subscription was"
-# approved_2: "approved."
-# approved_3: "Further instructions have been sent to"
-# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
-# contact_1: "Please contact"
-# contact_2: "if you have further questions."
-# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
-# description_2: "teachers"
-# description_3: "page."
-# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
-# email: "Email Address"
-# school_city: "Name of School, City"
-# age_students: "How old are your students?"
-# under: "Under"
-# other: "Other:"
-# amount_students: "How many students do you teach?"
-# hear_about: "How did you hear about CodeCombat?"
-# fill_fields: "Please fill out all fields."
-# thanks: "Thanks! We'll send you setup instructions shortly."
+ teachers_survey:
+ title: "Chestionar Educatori"
+ must_be_logged: "Mai întâi trebuie să fi logat. Te rugăm să faci un cont sau să te loghezi în meniul de mai sus."
+ retrieving: "Se preiau informațiile..."
+ being_reviewed_1: "Cererea pentru un abonament trial gratis este în curs de"
+ being_reviewed_2: "examinare" # {change}
+ approved_1: "Cererea pentru un abonament trial gratis a fost"
+ approved_2: "aprobată." # {change}
+ approved_3: "Mai multe instrucțiuni au fost timiste la"
+ denied_1: "Cererea pentru un abonament trial gratis a fost"
+ denied_2: "refuzată" # {change}
+ contact_1: "Contactează-ne"
+ contact_2: "dacă ai alte întrebări."
+ description_1: "Oferim abonamente gratis Educatorilor pentru evaluare. Poți găsi mai multe informați pe"
+ description_2: "pagina"
+ description_3: "educatorilor."
+ description_4: "Te rugăm să completezi acest formular rapid si îți vom trimite un email cu instrucțiuni."
+ email: "Adresă Email"
+# school: "Name of School"
+# location: "Name of City"
+ age_students: "Ce vârstă au studenții tăi?"
+ under: "Sub"
+ other: "Altele:"
+ amount_students: "La câți elevi le predai?"
+ hear_about: "De unde ai auzit de CodeCombat?"
+ fill_fields: "Te rugăm să completezi toate câmpurile."
+ thanks: "Mulțumim! Vom trimite instrucțiunile de setup în scurt timp."
versions:
save_version_title: "Salvează noua versiune"
new_major_version: "Versiune nouă majoră"
-# submitting_patch: "Submitting Patch..."
+ submitting_patch: "Trimitere Patch..."
cla_prefix: "Pentru a salva modificările mai intâi trebuie sa fiți de acord cu"
cla_url: "CLA"
cla_suffix: "."
@@ -683,14 +684,14 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
forum_prefix: "Pentru orice altceva vă rugăm sa incercați "
forum_page: "forumul nostru"
forum_suffix: " în schimb."
-# faq_prefix: "There's also a"
-# faq: "FAQ"
-# subscribe_prefix: "If you need help figuring out a level, please"
-# subscribe: "buy a CodeCombat subscription"
-# subscribe_suffix: "and we'll be happy to help you with your code."
-# subscriber_support: "Since you're a CodeCombat subscriber, your email will get our priority support."
-# screenshot_included: "Screenshot included."
-# where_reply: "Where should we reply?"
+ faq_prefix: "Există si un"
+ faq: "FAQ"
+ subscribe_prefix: "Daca ai nevoie de ajutor ca să termini un nivel te rugăm să"
+ subscribe: "cumperi un abonament CodeCombat"
+ subscribe_suffix: "si vom fi bucuroși să te ajutăm cu codul."
+ subscriber_support: "Din moment ce ești un abonat CodeCombat, adresa ta de email va primi sprijinul nostru prioritar."
+ screenshot_included: "Screenshot-uri incluse."
+ where_reply: "Unde ar trebui să răspundem?"
send: "Trimite Feedback"
contact_candidate: "Contacteaza Candidatul" # Deprecated
recruitment_reminder: "Folosiți acest formular pentru a ajunge la candidații care va intereseaza pentru interviu. CodeCombat percepe 15% din salariu în primul an. Taxa este datorată la angajare și este rambursabilă pentru 90 de zile în cazul în care salariatul nu rămâne angajat. Cele part time, și angajați cu contract la distanță sunt gratuite, așa cum sunt stagiari." # Deprecated
@@ -701,17 +702,19 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
autosave: "Modificările se salvează automat"
me_tab: "Eu"
picture_tab: "Poză"
-# delete_account_tab: "Delete Your Account"
-# wrong_email: "Wrong Email"
- upload_picture: "Uploadeaza o imagine"
-# delete_this_account: "Delete this account permanently"
+ delete_account_tab: "Șterge Contul"
+ wrong_email: "Email Greșit"
+# wrong_password: "Wrong Password"
+ upload_picture: "Uploadează o imagine"
+ delete_this_account: "Ștergere permanetă a acestui cont"
# god_mode: "God Mode"
password_tab: "Parolă"
emails_tab: "Email-uri"
admin: "Admin"
new_password: "Parolă nouă"
new_password_verify: "Verifică"
-# type_in_email: "Type in your email to confirm the deletion"
+ type_in_email: "Scrie adresa de email ca să confirmi ștergerea"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Subscripție Email"
email_subscriptions_none: "Nu ai subscripții Email."
email_announcements: "Anunțuri"
@@ -719,7 +722,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
email_notifications: "Notificări"
email_notifications_summary: "Control pentru notificări email personalizate, legate de activitatea CodeCombat."
email_any_notes: "Orice Notificări"
- email_any_notes_description: "Dezactivați pentru a opri toate e-mailurile de notificare a activității. Disable to stop all activity notification emails."
+ email_any_notes_description: "Dezactivați pentru a opri toate e-mailurile de notificare a activității."
email_news: "Noutăți"
email_recruit_notes: "Oportunități de job-uri"
email_recruit_notes_description: "Daca joci foarte bine, este posibil sa te contactăm pentru obținerea unui loc (mai bun) de muncă."
@@ -732,157 +735,158 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
saved: "Modificări salvate"
password_mismatch: "Parola nu se potrivește."
password_repeat: "Te rugăm sa repeți parola."
-# job_profile: "Job Profile" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-# job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-# job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
+ job_profile: "Profil Job" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
+ job_profile_approved: "Profilul de job a fost aprobat de CodeCombat Angajatorii pot să il vadă pană îl marchezi ca inactiv sau dacă nu e schimbat timp de 4 săptămâni."
+ job_profile_explanation: "Salut! Completează formularul, și te vom contacta ca să iți gasești un job ca software developer."
sample_profile: "Vezi un profil exemplu"
view_profile: "Vizualizează Profilul"
-# keyboard_shortcuts:
-# keyboard_shortcuts: "Keyboard Shortcuts"
-# space: "Space"
-# enter: "Enter"
-# escape: "Escape"
-# shift: "Shift"
-# run_code: "Run current code."
-# run_real_time: "Run in real time."
-# continue_script: "Continue past current script."
-# skip_scripts: "Skip past all skippable scripts."
-# toggle_playback: "Toggle play/pause."
-# scrub_playback: "Scrub back and forward through time."
-# single_scrub_playback: "Scrub back and forward through time by a single frame."
-# scrub_execution: "Scrub through current spell execution."
-# toggle_debug: "Toggle debug display."
-# toggle_grid: "Toggle grid overlay."
-# toggle_pathfinding: "Toggle pathfinding overlay."
-# beautify: "Beautify your code by standardizing its formatting."
-# maximize_editor: "Maximize/minimize code editor."
+ keyboard_shortcuts:
+ keyboard_shortcuts: "Scurtături Keyboard"
+ space: "Space"
+ enter: "Enter"
+# press_enter: "press enter"
+ escape: "Escape"
+ shift: "Shift"
+ run_code: "Rulează codul."
+ run_real_time: "Rulează în timp real."
+ continue_script: "Continue past current script."
+ skip_scripts: "Treci peste toate script-urile ce pot fi sărite."
+ toggle_playback: "Comută play/pause."
+ scrub_playback: "Mergi înainte si înapoi in timp."
+ single_scrub_playback: "Mergi înainte si înapoi in timp cu un singur cadru."
+ scrub_execution: "Mergi prin lista curentă de vrăji executate."
+ toggle_debug: "Comută afișaj debug."
+ toggle_grid: "Comută afișaj grilă."
+ toggle_pathfinding: "Comută afișaj pathfinding."
+ beautify: "Înfrumusețează codul standardizând formatarea lui."
+ maximize_editor: "Mărește/Micește editorul."
-# community:
-# main_title: "CodeCombat Community"
-# introduction: "Check out the ways you can get involved below and decide what sounds the most fun. We look forward to working with you!"
-# level_editor_prefix: "Use the CodeCombat"
-# level_editor_suffix: "to create and edit levels. Users have created levels for their classes, friends, hackathons, students, and siblings. If create a new level sounds intimidating you can start by forking one of ours!"
-# thang_editor_prefix: "We call units within the game 'thangs'. Use the"
-# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites."
-# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the"
-# article_editor_suffix: "and help CodeCombat players get the most out of their playtime."
-# find_us: "Find us on these sites"
-# social_blog: "Read the CodeCombat blog on Sett"
-# social_discource: "Join the discussion on our Discourse forum"
-# social_facebook: "Like CodeCombat on Facebook"
-# social_twitter: "Follow CodeCombat on Twitter"
-# social_gplus: "Join CodeCombat on Google+"
-# social_hipchat: "Chat with us in the public CodeCombat HipChat room"
-# contribute_to_the_project: "Contribute to the project"
+ community:
+ main_title: "Comunitatea CodeCombat"
+ introduction: "Vezi metode prin care poți să te implici și tu mai jos și decide să alegi ce ți se pare cel mai distractiv. Deabia așteptăm să lucrăm împreună!"
+ level_editor_prefix: "Folosește CodeCombat"
+ level_editor_suffix: "Pentru a crea și a edita nivele. Useri au creat nivele pentru clasele lor, prieteni, hackathonuri, studenți si rude. Dacă crearea unui nivel nou ți se pare intimidant poți sa modifici un nivel creat de noi!"
+ thang_editor_prefix: "Numim unitățile din joc 'thangs'. Folosește"
+ thang_editor_suffix: "pentru a modifica ilustrațile sursă CodeCombat. Permitele unitătilor sa arunce proiectile, schimbă direcția unei animații, schimbă viața unei unități, sau uploadează propiile sprite-uri vectoriale."
+ article_editor_prefix: "Vezi o greșală in documentația noastă? Vrei să documentezi instrucțiuni pentru propiile creații? Vezi"
+ article_editor_suffix: "si ajută jucători CodeCombat să obțină căt mai multe din playtime-ul lor."
+ find_us: "Ne găsești pe aceste site-uri"
+ social_blog: "Citește blogul CodeCombat pe Sett"
+ social_discource: "Alăturăte discuțiilor pe forumul Discourse"
+ social_facebook: "Lasă un Like pentru CodeCombat pe facebook"
+ social_twitter: "Urmărește CodeCombat pe Twitter"
+ social_gplus: "Alăturăte pe Google+"
+ social_hipchat: "Vorbește cu noi pe chatul public HipChat camera CodeCombat"
+ contribute_to_the_project: "Contribuie la proiect"
-# clans:
-# clan: "Clan"
-# clans: "Clans"
-# new_name: "New clan name"
-# new_description: "New clan description"
-# make_private: "Make clan private"
-# subs_only: "subscribers only"
-# create_clan: "Create New Clan"
-# public_clans: "Public Clans"
-# my_clans: "My Clans"
-# clan_name: "Clan Name"
-# name: "Name"
-# chieftain: "Chieftain"
-# type: "Type"
-# edit_clan_name: "Edit Clan Name"
-# edit_clan_description: "Edit Clan Description"
-# edit_name: "edit name"
-# edit_description: "edit description"
-# private: "(private)"
-# summary: "Summary"
-# average_level: "Average Level"
-# average_achievements: "Average Achievements"
-# delete_clan: "Delete Clan"
-# leave_clan: "Leave Clan"
-# join_clan: "Join Clan"
-# invite_1: "Invite:"
-# invite_2: "*Invite players to this Clan by sending them this link."
-# members: "Members"
-# progress: "Progress"
-# not_started_1: "not started"
-# started_1: "started"
-# complete_1: "complete"
-# exp_levels: "Expand levels"
-# rem_hero: "Remove Hero"
-# status: "Status"
-# complete_2: "Complete"
-# started_2: "Started"
-# not_started_2: "Not Started"
-# view_solution: "Click to view solution."
-# latest_achievement: "Latest Achievement"
-# playtime: "Playtime"
-# last_played: "Last played"
+ clans:
+ clan: "Clan"
+ clans: "Clanuri"
+ new_name: "Nume nou de clan"
+ new_description: "Descrierea clanului nou"
+ make_private: "Fă clanul privat"
+ subs_only: "numai abonați"
+ create_clan: "Creează un clan Nou"
+ public_clans: "Clanuri Publice"
+ my_clans: "Clanurile mele"
+ clan_name: "Numele Clanului"
+ name: "Nume"
+ chieftain: "Chieftain"
+ type: "Tip"
+ edit_clan_name: "Editează numele clanului"
+ edit_clan_description: "Editează descrierea clanului"
+ edit_name: "editează nume"
+ edit_description: "editează descriere"
+ private: "(privat)"
+ summary: "Sumar"
+ average_level: "Medie Level"
+ average_achievements: "Medie Achievements"
+ delete_clan: "Șterge Clan"
+ leave_clan: "Pleacă din Clan"
+ join_clan: "Intră în Clan"
+ invite_1: "Invitație:"
+ invite_2: "*Invită jucători in acest clan trimițându-le acest link."
+ members: "Membrii"
+ progress: "Progres"
+ not_started_1: "neînceput"
+ started_1: "început"
+ complete_1: "complet"
+ exp_levels: "Extinde nivele"
+ rem_hero: "Șterge Eroul"
+ status: "Stare"
+ complete_2: "Complet"
+ started_2: "Început"
+ not_started_2: "Neînceput"
+ view_solution: "Click pentru a vedea soluția."
+ latest_achievement: "Ultimile Achievement-uri"
+ playtime: "Timp Jucat"
+ last_played: "Ultima oară cănd ai jucat"
classes:
archmage_title: "Archmage"
archmage_title_description: "(Programator)"
-# archmage_summary: "If you are a developer interested in coding educational games, become an archmage to help us build CodeCombat!"
+ archmage_summary: "Dacă ești un dezvoltator interesat să programezi jocuri educaționale, devino Archmage si ajută-ne să construim CodeCombat!"
artisan_title: "Artizan"
artisan_title_description: "(Creator de nivele)"
-# artisan_summary: "Build and share levels for you and your friends to play. Become an Artisan to learn the art of teaching others to program."
+ artisan_summary: "Construiește si oferă nivele pentru tine si pentru prieteni tăi, ca să se joace. Devino Artisan si învață arta de a împărți cunoștințe despre programare."
adventurer_title: "Aventurier"
adventurer_title_description: "(Playtester de nivele)"
-# adventurer_summary: "Get our new levels (even our subscriber content) for free one week early and help us work out bugs before our public release."
+ adventurer_summary: "Primește nivelele noastre noi (chiar si cele pentru abonați) gratis cu o săptămână înainte si ajută-ne să reparăm bug-uri până la lansare."
scribe_title: "Scrib"
scribe_title_description: "(Editor de articole)"
-# scribe_summary: "Good code needs good documentation. Write, edit, and improve the docs read by millions of players across the globe."
+ scribe_summary: "Un cod bun are nevoie de o documentație bună. Scrie, editează, si improvizează documentația citită de milioane de jucători în întreaga lume."
diplomat_title: "Diplomat"
diplomat_title_description: "(Translator)"
-# diplomat_summary: "CodeCombat is localized in 45+ languages by our Diplomats. Help us out and contribute translations."
+ diplomat_summary: "CodeCombat e localizat în 45+ de limbi de Diplomații noștri. Ajută-ne și contribuie la traducere."
ambassador_title: "Ambasador"
ambassador_title_description: "(Suport)"
-# ambassador_summary: "Tame our forum users and provide direction for those with questions. Our ambassadors represent CodeCombat to the world."
+ ambassador_summary: "Îmblânzește useri de pe forumul nostru si oferă direcți pentru cei cu întrebări. Ambasadori noștri reprezintă CodeCombat în fața lumii."
editor:
main_title: "Editori CodeCombat"
article_title: "Editor Articol"
thang_title: "Editor Thang"
level_title: "Editor Nivele"
-# achievement_title: "Achievement Editor"
-# poll_title: "Poll Editor"
-# back: "Back"
+ achievement_title: "Editor Achievement"
+ poll_title: "Editor Sondaje"
+ back: "Înapoi"
revert: "Revino la versiunea anterioară"
revert_models: "Resetează Modelele"
-# pick_a_terrain: "Pick A Terrain"
-# dungeon: "Dungeon"
-# indoor: "Indoor"
-# desert: "Desert"
-# grassy: "Grassy"
-# small: "Small"
-# large: "Large"
-# fork_title: "Fork New Version"
-# fork_creating: "Creating Fork..."
-# generate_terrain: "Generate Terrain"
-# more: "More"
-# wiki: "Wiki"
-# live_chat: "Live Chat"
-# thang_main: "Main"
-# thang_spritesheets: "Spritesheets"
-# thang_colors: "Colors"
+ pick_a_terrain: "Alege Terenul"
+ dungeon: "Temniță"
+ indoor: "Interior"
+ desert: "Deșert"
+ grassy: "Ierbos"
+ small: "Mic"
+ large: "Mare"
+ fork_title: "Fork Versiune Nouă"
+ fork_creating: "Creare Fork..."
+ generate_terrain: "Generează Teren"
+ more: "Mai Multe"
+ wiki: "Wiki"
+ live_chat: "Chat Live"
+ thang_main: "Principal"
+ thang_spritesheets: "Spritesheets"
+ thang_colors: "Culori"
level_some_options: "Opțiuni?"
level_tab_thangs: "Thangs"
level_tab_scripts: "Script-uri"
level_tab_settings: "Setări"
level_tab_components: "Componente"
level_tab_systems: "Sisteme"
-# level_tab_docs: "Documentation"
+ level_tab_docs: "Documentație"
level_tab_thangs_title: "Thangs actuali"
-# level_tab_thangs_all: "All"
+ level_tab_thangs_all: "Toate"
level_tab_thangs_conditions: "Condiți inițiale"
level_tab_thangs_add: "Adaugă Thangs"
-# add_components: "Add Components"
-# component_configs: "Component Configurations"
-# config_thang: "Double click to configure a thang"
-# delete: "Delete"
-# duplicate: "Duplicate"
-# stop_duplicate: "Stop Duplicate"
-# rotate: "Rotate"
+ add_components: "Adaugă Componente"
+ component_configs: "Configurarea Componentelor"
+ config_thang: "Dublu click pentru a configura un thang"
+ delete: "Șterge"
+ duplicate: "Duplică"
+ stop_duplicate: "Oprește Duplicarea"
+ rotate: "Rotește"
level_settings_title: "Setări"
level_component_tab_title: "Componente actuale"
level_component_btn_new: "Crează componentă nouă"
@@ -891,7 +895,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
level_systems_btn_add: "Adaugă Sistem"
level_components_title: "Înapoi la toți Thangs"
level_components_type: "Tip"
- level_component_edit_title: "Editează Componenta"
+ level_component_edit_title: "Editează Componentă"
level_component_config_schema: "Schema Config"
level_component_settings: "Setări"
level_system_edit_title: "Editează Sistem"
@@ -901,47 +905,47 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
new_article_title: "Crează un articol nou"
new_thang_title: "Crează un nou tip de Thang"
new_level_title: "Crează un nivel nou"
-# new_article_title_login: "Log In to Create a New Article"
-# new_thang_title_login: "Log In to Create a New Thang Type"
-# new_level_title_login: "Log In to Create a New Level"
-# new_achievement_title: "Create a New Achievement"
-# new_achievement_title_login: "Log In to Create a New Achievement"
-# new_poll_title: "Create a New Poll"
-# new_poll_title_login: "Log In to Create a New Poll"
+ new_article_title_login: "Loghează-te pentru a crea un Articol Nou"
+ new_thang_title_login: "Loghează-te pentru a crea un Thang de Tip Nou"
+ new_level_title_login: "Loghează-te pentru a crea un Nivel Nou"
+ new_achievement_title: "Crează un Achivement Nou"
+ new_achievement_title_login: "Loghează-te pentru a crea un Achivement Nou"
+ new_poll_title: "Crează un Sondaj Nou"
+ new_poll_title_login: "Loghează-te pentru a crea un Sondaj Nou"
article_search_title: "Caută articole aici"
thang_search_title: "Caută tipuri de Thang aici"
level_search_title: "Caută nivele aici"
-# achievement_search_title: "Search Achievements"
-# poll_search_title: "Search Polls"
-# read_only_warning2: "Note: you can't save any edits here, because you're not logged in."
-# no_achievements: "No achievements have been added for this level yet."
-# achievement_query_misc: "Key achievement off of miscellanea"
-# achievement_query_goals: "Key achievement off of level goals"
-# level_completion: "Level Completion"
-# pop_i18n: "Populate I18N"
-# tasks: "Tasks"
-# clear_storage: "Clear your local changes"
+ achievement_search_title: "Caută Achievements"
+ poll_search_title: "Caută Sondaje"
+ read_only_warning2: "Notă: nu poți salva editările aici, pentru că nu ești logat."
+ no_achievements: "Nici-un achivement adăugat acestui nivel până acum."
+ achievement_query_misc: "Key achievement din diverse"
+ achievement_query_goals: "Key achievement din obiectivele nivelelor"
+ level_completion: "Finalizare Nivel"
+ pop_i18n: "Populează I18N"
+ tasks: "Sarcini"
+ clear_storage: "Șterge schimbările locale"
article:
edit_btn_preview: "Preview"
edit_article_title: "Editează Articol"
-# polls:
-# priority: "Priority"
+ polls:
+ priority: "Prioritate"
contribute:
page_title: "Contribuțtii"
-# intro_blurb: "CodeCombat is 100% open source! Hundreds of dedicated players have helped us build the game into what it is today. Join us and write the next chapter in CodeCombat's quest to teach the world to code!"
+ intro_blurb: "CodeCombat este 100% open source! Sute de jucători dedicați ne-au ajutat sa construim jocul în cea ce este astăzi. Alătură-te si scrie următorul capitol în aventura CodeCombat de a ajuta lumea să învețe cod!"
alert_account_message_intro: "Salutare!"
-# alert_account_message: "To subscribe for class emails, you'll need to be logged in first."
- archmage_introduction: "Una dintre cele mai bune părți despre construirea unui joc este că sintetizează atât de multe lucruri diferite. Grafică, sunet, networking în timp real, social networking, și desigur multe dintre aspectele comune ale programării, de la gestiune low-level a bazelor de date, și administrare server până la construirea de interfețe. Este mult de muncă, și dacă ești un programator cu experiență, cu un dor de a se arunca cu capul înainte îm CodeCombat, această clasă ți se potrivește. Ne-ar plăcea să ne ajuți să construim cel mai bun joc de programare făcut vreodată."
+ alert_account_message: "Pentru a te abona la mailurile clasei trebuie să fi logat."
+ archmage_introduction: "Una dintre cele mai bune părți despre construirea unui joc este că sintetizează atât de multe lucruri diferite. Grafică, Sunet, Networking în timp real, Social Networking, și desigur multe dintre aspectele comune ale programării, de la gestiune low-level a bazelor de date, și administrare server până la construirea de interfețe. Este mult de muncă, și dacă ești un programator cu experiență, cu un dor de a se arunca cu capul înainte îm CodeCombat, această clasă ți se potrivește. Ne-ar plăcea să ne ajuți să construim cel mai bun joc de programare făcut vreodată."
class_attributes: "Atribute pe clase"
archmage_attribute_1_pref: "Cunoștințe în "
archmage_attribute_1_suf: ", sau o dorință de a învăța. Majoritatea codului este în acest limbaj. Dacă ești fan Ruby sau Python, te vei simți ca acasă. Este JavaScript, dar cu o sintaxă mai frumoasă."
archmage_attribute_2: "Ceva experiență în programare și inițiativă personală. Te vom ajuta să te orientezi, dar nu putem aloca prea mult timp pentru a te pregăti."
how_to_join: "Cum să ni te alături"
join_desc_1: "Oricine poate să ajute! Doar intrați pe "
- join_desc_2: "pentru a începe, și bifați căsuța de dedesubt pentru a te marca ca un Archmage curajos și pentru a primi ultimele știri pe email. Vrei să discuți despre ce să faci sau cum să te implici mai mult? "
+ join_desc_2: "pentru a începe, bifați căsuța de dedesubt pentru a te marca ca un Archmage curajos și pentru a primi ultimele știri pe email. Vrei să discuți despre ce să faci sau cum să te implici mai mult? "
join_desc_3: ", sau găsește-ne în "
join_desc_4: "și pornim de acolo!"
join_url_email: "Trimite-ne Email"
@@ -958,37 +962,37 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
artisan_join_step3: "Găsește-ne pe chatul nostru de Hipchat pentru ajutor."
artisan_join_step4: "Postează nivelele tale pe forum pentru feedback."
artisan_subscribe_desc: "Primește email-uri despre update-uri legate de Editorul de Nivele și anunțuri."
- adventurer_introduction: "Să fie clar ce implică rolul tău: tu ești tancul. Vei avea multe de îndurat. Avem nevoie de oameni care să testeze nivelele noi și să ne ajute să găsim moduri noi de a le îmbunătăți. Va fi greu; să creezi jocuri bune este un proces dificil și nimeni nu o face perfect din prima. Dacă crezi că poți îndura , atunci aceasta este clasa pentru tine."
+ adventurer_introduction: "Să fie clar ce implică rolul tău: tu ești tancul. Vei avea multe de îndurat. Avem nevoie de oameni care să testeze nivelele noi și să ne ajute să găsim moduri noi de a le îmbunătăți. Va fi greu; să creezi jocuri bune este un proces dificil și nimeni nu o face perfect din prima. Dacă crezi că poți îndura, atunci aceasta este clasa pentru tine."
adventurer_attribute_1: "O sete de cunoaștere. Tu vrei să înveți cum să programezi și noi vrem să te învățăm. Cel mai probabil tu vei fi cel care va preda mai mult în acest caz."
adventurer_attribute_2: "Carismatic. Formulează într-un mod clar ceea ce trebuie îmbunătățit și oferă sugestii."
- adventurer_join_pref: "Ori fă echipă (sau recrutează!) cu un Artizan și lucrează cu el, sau bifează căsuța de mai jos pentru a primi email când sunt noi nivele de testat. De asemenea vom posta despre nivele care trebuiesc revizuite pe rețelele noastre precum"
+ adventurer_join_pref: "Ori fă echipă (sau recrutează!) cu un Artizan și lucrează cu el, sau bifează căsuța de mai jos pentru a primi email când sunt noi nivele de testat. De asemenea vom posta despre nivele care trebuie revizuite pe rețelele noastre precum"
adventurer_forum_url: "forumul nostru"
- adventurer_join_suf: "deci dacă preferi să fi înștiințat în acele moduri ,înscrie-te acolo!"
+ adventurer_join_suf: "deci dacă preferi să fi înștiințat în acele moduri, înscrie-te acolo!"
adventurer_subscribe_desc: "Primește email-uri când sunt noi nivele de testat."
-# scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
-# scribe_introduction_url_mozilla: "Mozilla Developer Network"
-# scribe_introduction_suf: " has built. If your idea of fun is articulating the concepts of programming in Markdown form, then this class might be for you."
-# scribe_attribute_1: "Skill in words is pretty much all you need. Not only grammar and spelling, but able to convey complicated ideas to others."
-# contact_us_url: "Contact us"
-# scribe_join_description: "tell us a little about yourself, your experience with programming and what sort of things you'd like to write about. We'll go from there!"
-# scribe_subscribe_desc: "Get emails about article writing announcements."
-# diplomat_introduction_pref: "So, if there's one thing we learned from the "
-# diplomat_launch_url: "launch in October"
-# diplomat_introduction_suf: "it's that there is sizeable interest in CodeCombat in other countries! We're building a corps of translators eager to turn one set of words into another set of words to get CodeCombat as accessible across the world as possible. If you like getting sneak peeks at upcoming content and getting these levels to your fellow nationals ASAP, then this class might be for you."
-# diplomat_attribute_1: "Fluency in English and the language you would like to translate to. When conveying complicated ideas, it's important to have a strong grasp in both!"
-# diplomat_i18n_page_prefix: "You can start translating our levels by going to our"
-# diplomat_i18n_page: "translations page"
-# diplomat_i18n_page_suffix: ", or our interface and website on GitHub."
-# diplomat_join_pref_github: "Find your language locale file "
-# diplomat_github_url: "on GitHub"
-# diplomat_join_suf_github: ", edit it online, and submit a pull request. Also, check this box below to keep up-to-date on new internationalization developments!"
-# diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
-# ambassador_introduction: "This is a community we're building, and you are the connections. We've got forums, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
-# ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
-# ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
-# ambassador_join_note_strong: "Note"
-# ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-# ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
+ scribe_introduction_pref: "CodeCombat nu o să fie doar o colecție de nivele. Vor fi incluse resurse de cunoaștere, un wiki despre concepte de programare legate de fiecare nivel. În felul acesta fiecare Arisan nu trebuie să mai descrie în detaliu ce este un operator de comparație, ei pot să pună un link la un Articol mai bine documentat. Ceva asemănător cu ce "
+ scribe_introduction_url_mozilla: "Mozilla Developer Network"
+ scribe_introduction_suf: " a construit. Dacă idea ta de distracție este să articulezi conceptele de programare în formă Markdown, această clasă ți s-ar potrivi."
+ scribe_attribute_1: "Un talent în cuvinte este tot ce îți trebuie. Nu numai gramatică și ortografie, trebuie să poți să explici ideii complicate celorlați."
+ contact_us_url: "Contactați-ne"
+ scribe_join_description: "spune-ne câte ceva despre tine, experiențele tale despre programare și ce fel de lucruri ți-ar place să scri despre. Vom începe de acolo!."
+ scribe_subscribe_desc: "Primește mailuri despre scrisul de articole."
+ diplomat_introduction_pref: "Dacă ar fi un lucru care l-am învățat din "
+ diplomat_launch_url: "lansarea din Octombire"
+ diplomat_introduction_suf: "acesta ar fi că: există un interes mare pentru CodeCombat și în alte țări! Încercăm sa adunăm cât mai mulți translatori care sunt pregătiți să transforme un set de cuvinte intr-un alt set de cuvinte ca să facă CodeCombat cât mai accesibil în toată lumea. Dacă vrei să tragi cu ochiul la conțintul ce va apărea și să aduci nivele cât mai repede pentru conaționali tăi, această clasă ți se potriveste."
+ diplomat_attribute_1: "Fluență în Engleză și limba în care vrei să traduci. Când explici ideii complicate este important să întelegi bine ambele limbi!"
+ diplomat_i18n_page_prefix: "Poți începe să traduci nivele accesând"
+ diplomat_i18n_page: "Pagina de traduceri"
+ diplomat_i18n_page_suffix: ", sau interfața si website-ul pe GitHub."
+ diplomat_join_pref_github: "Găsește fișierul pentru limba ta "
+ diplomat_github_url: "pe GitHub"
+ diplomat_join_suf_github: ", editeazăl online si trimite un pull request. Bifează căsuța de mai jos ca să fi up-to-date cu dezvoltările noastre internaționale!"
+ diplomat_subscribe_desc: "Primește mail-uri despre dezvoltările i18n si niveluri de tradus."
+ ambassador_introduction: "Aceasta este o comunitate pe care o construim, iar voi sunteți conexiunile. Avem forumui, email-uri, si rețele sociale cu mulți oameni cu care se poate vorbi despre joc și de la care se poate învața. Dacă vrei să ajuți oameni să se implice și să se distreze această clasă este potrivită pentru tine."
+ ambassador_attribute_1: "Abilități de comunicare. Abilitatea de a indentifica problemele pe care jucătorii le au si șa îi poti ajuta. De asemenea, trebuie să ne informezi cu părerile jucătoriilor, ce le place și ce vor mai mult!"
+ ambassador_join_desc: "spune-ne câte ceva despre tine, ce ai făcut si ce te interesează să faci. Vom porni de acolo!."
+ ambassador_join_note_strong: "Notă"
+ ambassador_join_note_desc: "Una din prioritățile noaste este să constrruim un joc multiplayer unde jucători noștri, dacă au probleme pot să cheme un wizard cu un nivel ridicat să îi ajute."
+ ambassador_subscribe_desc: "Primește mailuri despre support updates și dezvoltări multiplayer."
changes_auto_save: "Modificările sunt salvate automat când apeși checkbox-uri."
diligent_scribes: "Scribii noștri:"
powerful_archmages: "Bravii noștri Archmage:"
@@ -1008,7 +1012,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
games_simulated_for: "Jocuri simulate pentru tine:"
games_simulated: "Jocuri simulate"
games_played: "Jocuri jucate"
- ratio: "Ratie"
+ ratio: "Rație"
leaderboard: "Clasament"
battle_as: "Luptă ca "
summary_your: "Al tău "
@@ -1021,190 +1025,190 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
rank_submitted: "Se trimite pentru Clasament"
rank_failed: "A eșuat plasarea in clasament"
rank_being_ranked: "Jocul se plasează in Clasament"
-# rank_last_submitted: "submitted "
-# help_simulate: "Help simulate games?"
+ rank_last_submitted: "trimis "
+ help_simulate: "Ne ajuți simulând jocuri?"
code_being_simulated: "Codul tău este simulat de alți jucători pentru clasament. Se va actualiza cum apar meciuri."
no_ranked_matches_pre: "Nici un meci de clasament pentru "
- no_ranked_matches_post: " echipă! Joacă împotriva unor concurenți și revino apoi aici pentr a-ți plasa meciul in clasament."
+ no_ranked_matches_post: " echipă! Joacă împotriva unor concurenți și revino apoi aici pentru a-ți plasa meciul in clasament."
choose_opponent: "Alege un adversar"
select_your_language: "Alege limbă!"
tutorial_play: "Joacă Tutorial-ul"
tutorial_recommended: "Recomandat dacă nu ai mai jucat niciodată înainte"
- tutorial_skip: "Sari peste Tutorial"
+ tutorial_skip: "Sări peste Tutorial"
tutorial_not_sure: "Nu ești sigur ce se întâmplă?"
tutorial_play_first: "Joacă Tutorial-ul mai întâi."
simple_ai: "AI simplu"
warmup: "Încălzire"
-# friends_playing: "Friends Playing"
-# log_in_for_friends: "Log in to play with your friends!"
-# social_connect_blurb: "Connect and play against your friends!"
-# invite_friends_to_battle: "Invite your friends to join you in battle!"
-# fight: "Fight!"
-# watch_victory: "Watch your victory"
-# defeat_the: "Defeat the"
-# tournament_started: ", started"
-# tournament_ends: "Tournament ends"
-# tournament_ended: "Tournament ended"
-# tournament_rules: "Tournament Rules"
-# tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
-# 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_zero_sum: "Unleash your coding creativity in both gold gathering and battle tactics in this alpine mirror match between red sorcerer and blue sorcerer. The tournament began on Friday, March 27 and will run until Monday, April 6 at 5PM PDT. Compete for fun and glory! Check out the details"
-# tournament_blurb_blog: "on our blog"
-# rules: "Rules"
-# winners: "Winners"
+ friends_playing: "Prieteni ce se Joacă"
+ log_in_for_friends: "Loghează-te ca să joci cu prieteni tăi!"
+ social_connect_blurb: "Conectează-te și joacă împotriva prietenilor tăi!"
+ invite_friends_to_battle: "Invită-ți prieteni să se alăture bătăliei"
+ fight: "Luptă!"
+ watch_victory: "Vizualizează victoria"
+ defeat_the: "Învinge"
+ tournament_started: ", a început"
+ tournament_ends: "Turneul se termină"
+ tournament_ended: "Turneul s-a terminat"
+ tournament_rules: "Regulile Turneului"
+ tournament_blurb: "Scrie cod, colectează aur, construiește armate, distruge inamici, câștigă premii, si îmbunătățeșteți cariera în turneul Lăcomiei de $40,000! Află detalii"
+ tournament_blurb_criss_cross: "Caștigă pariuri, creează căi, păcălește-ți oponenți, strâange Pietre Prețioase, si îmbunătățeșteți cariera in turneul Criss-Cross! Află detalii"
+ tournament_blurb_zero_sum: "Dezlănțuie creativitatea de programare în strângerea de aur sau în tactici de bătălie în alpine mirror match dintre vrăitori roșii și cei albaștrii.Turneul începe Vineri, 27 Martie și se va desfăsura până Luni, 6 Aprilie la 5PM PDT. Află detalii"
+ tournament_blurb_blog: "pe blogul nostru"
+ rules: "Reguli"
+ winners: "Învingători"
-# user:
-# stats: "Stats"
-# singleplayer_title: "Singleplayer Levels"
-# multiplayer_title: "Multiplayer Levels"
-# achievements_title: "Achievements"
-# last_played: "Last Played"
-# status: "Status"
-# status_completed: "Completed"
-# status_unfinished: "Unfinished"
-# no_singleplayer: "No Singleplayer games played yet."
-# no_multiplayer: "No Multiplayer games played yet."
-# no_achievements: "No Achievements earned yet."
-# favorite_prefix: "Favorite language is "
-# favorite_postfix: "."
-# not_member_of_clans: "Not a member of any clans yet."
+ user:
+ stats: "Statistici"
+ singleplayer_title: "Nivele Singleplayer"
+ multiplayer_title: "Nivele Multiplayer"
+ achievements_title: "Achievement-uri"
+ last_played: "Ultima oară jucat"
+ status: "Stare"
+ status_completed: "Complet"
+ status_unfinished: "Neterminat"
+ no_singleplayer: "Nici-un joc Singleplayer jucat."
+ no_multiplayer: "Nici-un joc Multiplayer jucat."
+ no_achievements: "Nici-un Achivement câștigat."
+ favorite_prefix: "Limbaj preferat"
+ favorite_postfix: "."
+ not_member_of_clans: "Nu ești membrul unui clan."
-# achievements:
-# last_earned: "Last Earned"
-# amount_achieved: "Amount"
-# achievement: "Achievement"
-# category_contributor: "Contributor"
-# category_ladder: "Ladder"
-# category_level: "Level"
-# category_miscellaneous: "Miscellaneous"
-# category_levels: "Levels"
-# category_undefined: "Uncategorized"
-# current_xp_prefix: ""
-# current_xp_postfix: " in total"
-# new_xp_prefix: ""
-# new_xp_postfix: " earned"
-# left_xp_prefix: ""
-# left_xp_infix: " until level "
-# left_xp_postfix: ""
+ achievements:
+ last_earned: "Ultimul câstigat"
+ amount_achieved: "Sumă"
+ achievement: "Achievement"
+ category_contributor: "Contribuitor"
+ category_ladder: "Ladder"
+ category_level: "Nivel"
+ category_miscellaneous: "Diverse"
+ category_levels: "Nivele"
+ category_undefined: "Necategorizate"
+ current_xp_prefix: ""
+ current_xp_postfix: " în total"
+ new_xp_prefix: ""
+ new_xp_postfix: " câștigat"
+ left_xp_prefix: ""
+ left_xp_infix: " până la level"
+ left_xp_postfix: ""
-# account:
-# recently_played: "Recently Played"
-# no_recent_games: "No games played during the past two weeks."
-# payments: "Payments"
-# purchased: "Purchased"
-# subscription: "Subscription"
-# invoices: "Invoices"
-# service_apple: "Apple"
-# service_web: "Web"
-# paid_on: "Paid On"
-# service: "Service"
-# price: "Price"
-# gems: "Gems"
-# active: "Active"
-# subscribed: "Subscribed"
-# unsubscribed: "Unsubscribed"
-# active_until: "Active Until"
-# cost: "Cost"
-# next_payment: "Next Payment"
-# card: "Card"
-# status_unsubscribed_active: "You're not subscribed and won't be billed, but your account is still active for now."
-# status_unsubscribed: "Get access to new levels, heroes, items, and bonus gems with a CodeCombat subscription!"
+ account:
+ recently_played: "Recent Jucat"
+ no_recent_games: "Nici-un joc jucat de 2 săptămâni."
+ payments: "Plăți"
+ purchased: "Cumpărate"
+ subscription: "Abonament"
+ invoices: "Invoice-uri"
+ service_apple: "Apple"
+ service_web: "Web"
+ paid_on: "Plătit pe"
+ service: "Service"
+ price: "Preț"
+ gems: "Pietre Prețioase"
+ active: "Activ"
+ subscribed: "Abonat"
+ unsubscribed: "Dezabonat"
+ active_until: "Activ până"
+ cost: "Cost"
+ next_payment: "Următoarea Plată"
+ card: "Card"
+ status_unsubscribed_active: "Nu ești abonat si nu vei fi facturat, contul tău este activ deocamdată."
+ status_unsubscribed: "Primește access la nivele noi, eroi, iteme, și Pietre Prețioase bonus cu un abonament CodeCombat!"
-# account_invoices:
-# amount: "Amount in US dollars"
-# declined: "Your card was declined"
-# invalid_amount: "Please enter a US dollar amount."
-# not_logged_in: "Log in or create an account to access invoices."
-# pay: "Pay Invoice"
-# purchasing: "Purchasing..."
-# retrying: "Server error, retrying."
-# success: "Successfully paid. Thanks!"
+ account_invoices:
+ amount: "Sumă in dolari US"
+ declined: "Cardul tău a fost refuzat"
+ invalid_amount: "Introdu o sumă in dolari US."
+ not_logged_in: "Logheazăte sau crează un cont pentru a accesa invoice-uri."
+ pay: "Plată Invoice"
+ purchasing: "Cumpăr..."
+ retrying: "Eroare server, reîncerc."
+ success: "Plătit cu success. Mulțumim!"
-# loading_error:
-# could_not_load: "Error loading from server"
-# connection_failure: "Connection failed."
-# unauthorized: "You need to be signed in. Do you have cookies disabled?"
-# forbidden: "You do not have the permissions."
-# not_found: "Not found."
-# not_allowed: "Method not allowed."
-# timeout: "Server timeout."
-# conflict: "Resource conflict."
-# bad_input: "Bad input."
-# server_error: "Server error."
-# unknown: "Unknown error."
+ loading_error:
+ could_not_load: "Eroare la încărcarea pe server"
+ connection_failure: "Conexiune eșuată."
+ unauthorized: "Este nevoie să te loghezi. Ai cookies dezactivate?"
+ forbidden: "Nu ai permisiune."
+ not_found: "Nu a fost găsit."
+ not_allowed: "Metodă nepermisă."
+ timeout: "Timeout Server."
+ conflict: "Conflict resurse."
+ bad_input: "Date greșite."
+ server_error: "Eroare Server."
+ unknown: "Eroare Necunoscută."
-# resources:
-# sessions: "Sessions"
-# your_sessions: "Your Sessions"
-# level: "Level"
-# social_network_apis: "Social Network APIs"
-# facebook_status: "Facebook Status"
-# facebook_friends: "Facebook Friends"
-# facebook_friend_sessions: "Facebook Friend Sessions"
-# gplus_friends: "G+ Friends"
-# gplus_friend_sessions: "G+ Friend Sessions"
-# leaderboard: "Leaderboard"
-# user_schema: "User Schema"
-# user_profile: "User Profile"
-# patch: "Patch"
-# patches: "Patches"
-# patched_model: "Source Document"
-# model: "Model"
-# system: "System"
-# systems: "Systems"
-# component: "Component"
-# components: "Components"
-# thang: "Thang"
-# thangs: "Thangs"
-# level_session: "Your Session"
-# opponent_session: "Opponent Session"
-# article: "Article"
-# user_names: "User Names"
-# thang_names: "Thang Names"
-# files: "Files"
-# top_simulators: "Top Simulators"
-# source_document: "Source Document"
-# document: "Document"
-# sprite_sheet: "Sprite Sheet"
-# employers: "Employers"
-# candidates: "Candidates"
-# candidate_sessions: "Candidate Sessions"
-# user_remark: "User Remark"
-# user_remarks: "User Remarks"
-# versions: "Versions"
-# items: "Items"
-# hero: "Hero"
-# heroes: "Heroes"
-# achievement: "Achievement"
-# clas: "CLAs"
-# play_counts: "Play Counts"
-# feedback: "Feedback"
-# payment_info: "Payment Info"
-# campaigns: "Campaigns"
-# poll: "Poll"
-# user_polls_record: "Poll Voting History"
+ resources:
+ sessions: "Sesiuni"
+ your_sessions: "Sesiunile Tale"
+ level: "Nivel"
+ social_network_apis: "Social Network APIs"
+ facebook_status: "Facebook Status"
+ facebook_friends: "Prieteni Facebook"
+ facebook_friend_sessions: "Sesiunile prietenilor de pe Facebook"
+ gplus_friends: "Prieteni G+"
+ gplus_friend_sessions: "Sesiunile prietenilor de pe G+"
+ leaderboard: "Leaderboard"
+ user_schema: "Schema User"
+ user_profile: "Profil User"
+ patch: "Patch"
+ patches: "Patch-uri"
+ patched_model: "Document Sursă"
+ model: "Model"
+ system: "Sistem"
+ systems: "Sisteme"
+ component: "Componentă"
+ components: "Componente"
+ thang: "Thang"
+ thangs: "Thangs"
+ level_session: "Sesiunea Ta"
+ opponent_session: "Sesiunea Oponentului"
+ article: "Articol"
+ user_names: "Nume Useri"
+ thang_names: "Nume Thang-uri"
+ files: "Fișiere"
+ top_simulators: "Top Simulatori"
+ source_document: "Document Sursă"
+ document: "Document"
+ sprite_sheet: "Sprite Sheet"
+ employers: "Angajatori"
+ candidates: "Candidați"
+ candidate_sessions: "Sesiuni Candidați"
+ user_remark: "Remarcări User"
+ user_remarks: "Remarcări Useri"
+ versions: "Versiuni"
+ items: "Iteme"
+ hero: "Erou"
+ heroes: "Eroii"
+ achievement: "Achievement"
+ clas: "CLAs"
+ play_counts: "Jucate"
+ feedback: "Feedback"
+ payment_info: "Info Plăți"
+ campaigns: "Campanii"
+ poll: "Sondaj"
+ user_polls_record: "Istoric votări Sondaj"
-# delta:
-# added: "Added"
-# modified: "Modified"
-# deleted: "Deleted"
-# moved_index: "Moved Index"
-# text_diff: "Text Diff"
-# merge_conflict_with: "MERGE CONFLICT WITH"
-# no_changes: "No Changes"
+ delta:
+ added: "Adăugat"
+ modified: "Modificat"
+ deleted: "Șters"
+ moved_index: "Index Mutat"
+ text_diff: "Diff Text"
+ merge_conflict_with: "ÎBINĂ CONFLICTUL CU"
+ no_changes: "Fară Schimbări"
-# guide:
-# temp: "Temp"
+ guide:
+ temp: "Temp"
multiplayer:
multiplayer_title: "Setări Multiplayer" # We'll be changing this around significantly soon. Until then, it's not important to translate.
-# multiplayer_toggle: "Enable multiplayer"
-# multiplayer_toggle_description: "Allow others to join your game."
+ multiplayer_toggle: "Permite Multiplayer"
+ multiplayer_toggle_description: "Permitele altora să intre în jocul tău."
multiplayer_link_description: "Împărtășește acest link cu cei care vor să ți se alăture."
multiplayer_hint_label: "Hint:"
multiplayer_hint: " Apasă pe link pentru a selecta tot, apoi apasă ⌘-C sau Ctrl-C pentru a copia link-ul."
multiplayer_coming_soon: "Mai multe feature-uri multiplayer în curând!"
-# multiplayer_sign_in_leaderboard: "Sign in or create an account and get your solution on the leaderboard."
+ multiplayer_sign_in_leaderboard: "Loghează-te sau crează un cont pentru a pune soluția pe leaderboard."
legal:
page_title: "Aspecte Legale"
@@ -1213,11 +1217,11 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
github_url: "pagina noastră de GitHub"
opensource_description_center: "și ajută-ne dacă îți place! CodeCombat este construit peste o mulțime de proiecte open source, care noi le iubim. Vizitați"
archmage_wiki_url: "Archmage wiki"
- opensource_description_suffix: "pentru o listă cu software-ul care face acest joc posibil."
+ opensource_description_suffix: "pentru o listă cu software-ul care fac acest joc posibil."
practices_title: "Convenții"
practices_description: "Acestea sunt promisiunile noastre către tine, jucătorul, fără așa mulți termeni legali."
privacy_title: "Confidenţialitate şi termeni"
-# privacy_description: "We will not sell any of your personal information."
+ privacy_description: "Nu o să iți vindem datele personale."
security_title: "Securitate"
security_description: "Ne străduim să vă protejăm informațiile personale. Fiind un proiect open-source, site-ul nostru oferă oricui posibilitatea de a ne revizui și îmbunătăți sistemul de securitate."
email_title: "Email"
@@ -1225,7 +1229,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
email_settings_url: "setările tale de email"
email_description_suffix: " sau prin link-urile din email-urile care vi le trimitem, puteți să schimbați preferințele și să vâ dezabonați oricând."
cost_title: "Cost"
- cost_description: "Momentan, CodeCombat este 100% gratis! Unul dintre obiectele noastre principale este să îl menținem așa, astfel încât să poată juca cât mai mulți oameni. Dacă va fi nevoie , s-ar putea să percepem o plată pentru o pentru anumite servici,dar am prefera să nu o facem. Cu puțin noroc, vom putea susține compania cu:"
+ cost_description: "Momentan, CodeCombat este 100% gratis! Unul dintre obiectele noastre principale este să îl menținem așa, astfel încât să poată juca cât mai mulți oameni. Dacă va fi nevoie , s-ar putea să percepem o plată pentru anumite servici, dar am prefera să nu o facem. Cu puțin noroc, vom putea susține compania cu:"
copyrights_title: "Drepturi de autor și licențe"
contributor_title: "Acord de licență Contributor"
contributor_description_prefix: "Toți contribuitorii, atât pe site cât și pe GitHub-ul nostru, sunt supuși la"
@@ -1245,9 +1249,9 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
art_sprites: "Sprites"
art_other: "Orice si toate celelalte creații non-cod care sunt disponibile când se crează nivele."
art_access: "Momentan nu există nici un sistem universal,ușor pentru preluarea acestor bunuri. În general, preluați-le precum site-ul din URL-urile folosite, contactați-ne pentru asistență, sau ajutați-ne sa extindem site-ul pentru a face aceste bunuri mai ușor accesibile."
- art_paragraph_1: "Pentru atribuire, vă rugăm numiți și lăsați referire link la codecombat.com unde este folosită sursa sau unde este adecvat pentru mediu. De exemplu:"
+ art_paragraph_1: "Pentru atribuire, vă rugăm numiți și lăsați referire link la codecombat.com unde este folosită sursa sau unde este adecvat pentru mediu. De exemplu:"
use_list_1: "Dacă este folosit într-un film sau alt joc, includeți codecombat.com la credite."
- use_list_2: "Dacă este folosit pe un site, includeți un link in apropiere, de exemplu sub o imagine, sau in pagina generală de atribuiri unde menționați și alte Bunuri Creative și software open source folosit pe site. Ceva care face referință explicit la CodeCombat, precum o postare pe un blog care menționează CodeCombat, nu trebuie să facă o atribuire separată."
+ use_list_2: "Dacă este folosit pe un site, includeți un link in apropiere, de exemplu sub o imagine, sau in pagina generală de atribuiri unde menționați și alte Bunuri Creative și software open source folosit pe site. Ceva care face referință explicit la CodeCombat, precum o postare pe un blog care menționează CodeCombat, nu trebuie să se facă o atribuire separată."
art_paragraph_2: "Dacă conținutul folosit nu este creat de către CodeCombat ci de către un utilizator al codecombat.com,atunci faceți referință către ei, și urmăriți indicațiile de atribuire prevăzute în descrierea resursei dacă există."
rights_title: "Drepturi rezervate"
rights_desc: "Toate drepturile sunt rezervate pentru Nivele în sine. Asta include"
@@ -1261,193 +1265,193 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
nutshell_description: "Orice resurse vă punem la dispoziție în Editorul de Nivele puteți folosi liber cum vreți pentru a crea nivele. Dar ne rezervăm dreptul de a rezerva distribuția de nivele în sine (care sunt create pe codecombat.com) astfel încât să se poată percepe o taxă pentru ele pe vitor, dacă se va ajunge la așa ceva."
canonical: "Versiunea in engleză a acestui document este cea definitivă, versiunea canonică. Dacă există orice discrepanțe între traduceri, documentul in engleză are prioritate."
-# ladder_prizes:
-# title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
-# blurb_1: "These prizes will be awarded according to"
-# blurb_2: "the tournament rules"
-# blurb_3: "to the top human and ogre players."
-# blurb_4: "Two teams means double the prizes!"
-# blurb_5: "(There will be two first place winners, two second-place winners, etc.)"
-# rank: "Rank"
-# prizes: "Prizes"
-# total_value: "Total Value"
-# in_cash: "in cash"
-# custom_wizard: "Custom CodeCombat Wizard"
-# custom_avatar: "Custom CodeCombat avatar"
-# heap: "for six months of \"Startup\" access"
-# credits: "credits"
-# one_month_coupon: "coupon: choose either Rails or HTML"
-# one_month_discount: "discount, 30% off: choose either Rails or HTML"
-# license: "license"
-# oreilly: "ebook of your choice"
+ ladder_prizes:
+ title: "Premii Turnee" # This section was for an old tournament and doesn't need new translations now.
+ blurb_1: "Aceste premii se acordă în funcție de"
+ blurb_2: "Regulile Turneului"
+ blurb_3: "la jucători umani sau ogre de top."
+ blurb_4: "Două echipe înseamnă dublul premiilor!"
+ blurb_5: "(O să fie 2 câștigători pe primul loc, 2 pe locul 2, etc.)"
+ rank: "Rank"
+ prizes: "Premii"
+ total_value: "Valoare Totala"
+ in_cash: "în cash"
+ custom_wizard: "Wizard CodeCombat personalizat"
+ custom_avatar: "Avatar CodeCombat personalizat"
+ heap: "pentru 6 luni de acces \"Startup\""
+ credits: "credite"
+ one_month_coupon: "coupon: alege Rails sau HTML"
+ one_month_discount: "discount, 30% off: choose either Rails or HTML"
+ license: "licență"
+ oreilly: "ebook la alegere"
account_profile:
settings: "Setări" # We are not actively recruiting right now, so there's no need to add new translations for this section.
- edit_profile: "Modifica Profil"
+ edit_profile: "Modifică Profil"
done_editing: "Am terminat modificările."
profile_for_prefix: "Profil pentru "
profile_for_suffix: ""
featured: "Recomandate"
-# not_featured: "Not Featured"
-# looking_for: "Looking for:"
-# last_updated: "Last updated:"
-# contact: "Contact"
+ not_featured: "Nerecomandate"
+ looking_for: "Caută:"
+ last_updated: "Listă updatată:"
+ contact: "Contact"
active: "Caut oferte de interviu."
inactive: "Nu caut oferte"
complete: "complet"
- next: "Urmatorul"
- next_city: "oras?"
+ next: "Următorul"
+ next_city: "oraș?"
next_country: "alege țara."
next_name: "nume?"
- next_short_description: "scrie o scurta descriere."
+ next_short_description: "scrie o scurtă descriere."
next_long_description: "descrie poziția dorită."
- next_skills: "listeaza cel puțin cinci competențe."
+ next_skills: "listează cel puțin cinci competențe."
next_work: "cronica istoricului dvs. de lucru."
next_education: "povesteste-ne de chinurile educaționale"
next_projects: "scoate in evidență pana la 3 proiecte la care ai lucrat."
- next_links: "adăuga orice link-uri personale sau sociale."
- next_photo: "adăuga o fotografie profesionala opțională."
- next_active: "indica că esti deschis la oferte ca să apară în căutări."
+ next_links: "adăugă orice link-uri personale sau sociale."
+ next_photo: "adăugă o fotografie profesionala opțională."
+ next_active: "indică că esti deschis la oferte ca să apară în căutări."
example_blog: "Blog"
example_personal_site: "Site Personal"
links_header: "Link-uri Personale"
links_blurb: "Link către orice alte site-uri sau profiluri pe care doriți să se sublinieze, ca GitHub, LinkedIn, sau blog-ul personal."
links_name: "Nume Link"
- links_name_help: "Catre ce faci link?"
+ links_name_help: "Către ce faci link?"
links_link_blurb: "Link URL"
basics_header: "Actualizați informații de bază"
basics_active: "Deschis la Oferte"
-# basics_active_help: "Want interview offers right now?"
-# basics_job_title: "Desired Job Title"
-# basics_job_title_help: "What role are you looking for?"
-# basics_city: "City"
-# basics_city_help: "City you want to work in (or live in now)."
-# basics_country: "Country"
-# basics_country_help: "Country you want to work in (or live in now)."
-# basics_visa: "US Work Status"
-# basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-# basics_looking_for: "Looking For"
-# basics_looking_for_full_time: "Full-time"
-# basics_looking_for_part_time: "Part-time"
-# basics_looking_for_remote: "Remote"
-# basics_looking_for_contracting: "Contracting"
-# basics_looking_for_internship: "Internship"
-# basics_looking_for_help: "What kind of developer position do you want?"
-# name_header: "Fill in your name"
-# name_anonymous: "Anonymous Developer"
-# name_help: "Name you want employers to see, like 'Nick Winter'."
-# short_description_header: "Write a short description of yourself"
-# short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
-# short_description: "Tagline"
-# short_description_help: "Who are you, and what are you looking for? 140 characters max."
-# skills_header: "Skills"
-# skills_help: "Tag relevant developer skills in order of proficiency."
-# long_description_header: "Describe your desired position"
-# long_description_blurb: "Tell employers how awesome you are and what role you want."
-# long_description: "Self Description"
-# long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-# work_experience: "Work Experience"
-# work_header: "Chronicle your work history"
-# work_years: "Years of Experience"
-# work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
-# work_blurb: "List your relevant work experience, most recent first."
-# work_employer: "Employer"
-# work_employer_help: "Name of your employer."
-# work_role: "Job Title"
-# work_role_help: "What was your job title or role?"
-# work_duration: "Duration"
-# work_duration_help: "When did you hold this gig?"
-# work_description: "Description"
-# work_description_help: "What did you do there? (140 chars; optional)"
-# education: "Education"
-# education_header: "Recount your academic ordeals"
-# education_blurb: "List your academic ordeals."
-# education_school: "School"
-# education_school_help: "Name of your school."
-# education_degree: "Degree"
-# education_degree_help: "What was your degree and field of study?"
-# education_duration: "Dates"
-# education_duration_help: "When?"
-# education_description: "Description"
-# education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-# our_notes: "CodeCombat's Notes"
-# remarks: "Remarks"
-# projects: "Projects"
-# projects_header: "Add 3 projects"
-# projects_header_2: "Projects (Top 3)"
-# projects_blurb: "Highlight your projects to amaze employers."
-# project_name: "Project Name"
-# project_name_help: "What was the project called?"
-# project_description: "Description"
-# project_description_help: "Briefly describe the project."
-# project_picture: "Picture"
-# project_picture_help: "Upload a 230x115px or larger image showing off the project."
-# project_link: "Link"
-# project_link_help: "Link to the project."
-# player_code: "Player Code"
+ basics_active_help: "Vrei oferte de interviu chiar acum?"
+ basics_job_title: "Titlul jobului dorit"
+ basics_job_title_help: "What role are you looking for?"
+ basics_city: "Oraș"
+ basics_city_help: "Orașul în care vrei să muncești (sau unde locuiești acum)."
+ basics_country: "Țara"
+ basics_country_help: "Țara în care vrei să muncești (sau locuiești acum)."
+ basics_visa: "Stare Muncă in US"
+ basics_visa_help: "Ești autorizat să muncești în US sau ai nevoie de sponsorizare de viză? (Dacă locuești în Canada sau Australia, bifează autorizat.)"
+ basics_looking_for: "Caut"
+ basics_looking_for_full_time: "Full-time"
+ basics_looking_for_part_time: "Part-time"
+ basics_looking_for_remote: "La distanță"
+ basics_looking_for_contracting: "Contractant"
+ basics_looking_for_internship: "Internship"
+ basics_looking_for_help: "Ce fel de poziție ca Dezvoltator vrei?"
+ name_header: "Scrieți numele"
+ name_anonymous: "Dezvoltator Anonim"
+ name_help: "Numele pe care vrei ca angajatori să îl vadă, ex: 'Nick Winter'."
+ short_description_header: "Scrie o descriere scurtă despre tine"
+ short_description_blurb: "Adaugă un slogan ca un angajator să te cunoască mai repede."
+ short_description: "Slogan"
+ short_description_help: "Cine ești, și ce te interesează? 140 charactere max."
+ skills_header: "Aptitudini"
+ skills_help: "Alege aptitudini de dezvoltator relevante în ordinea experienței."
+ long_description_header: "Descrie poziția preferată"
+ long_description_blurb: "Spune-le angajatorilor cat de minunat ești si ce rol vrei."
+ long_description: "Descrierea Ta"
+ long_description_help: "Descrie-te la potențiali angajatori. Să fie scurt si la obiect. Recomandăm să subliniezi poziția care te interesează. Un Markdown savuros este ok; 600 charactere max."
+ work_experience: "Experiența Muncă"
+ work_header: "Istoricul locurilor undei ai muncit"
+ work_years: "Ani de experiență"
+ work_years_help: "Câți ani de experiență profesională (în care ai fost plătit) ca dezvoltator software ai?"
+ work_blurb: "Listează experiența de lucru relevantă, cea mai recentă prima."
+ work_employer: "Angajator"
+ work_employer_help: "Numele angajatorului."
+ work_role: "Titlul Jobului"
+ work_role_help: "Care a fost titlul jobului tău sau rolul?"
+ work_duration: "Durata"
+ work_duration_help: "Cand ai avut acest job?"
+ work_description: "Descriere"
+ work_description_help: "Ce ai făcut acolo? (14 char: opțional) "
+ education: "Educație"
+ education_header: "Povestește-ne chinurile academice"
+ education_blurb: "Listează informații despre educația ta."
+ education_school: "Școală"
+ education_school_help: "Numele Școlii"
+ education_degree: "Grad"
+ education_degree_help: "Care a fost gradul si domeniul de studiu?"
+ education_duration: "Date"
+ education_duration_help: "Când?"
+ education_description: "Descriere"
+ education_description_help: "Evidențiază orice despre experiența ta educațională. (140 char; opțional)"
+ our_notes: "Note CodeCombat"
+ remarks: "Observații"
+ projects: "Proiecte"
+ projects_header: "Adaugă 3 proiecte"
+ projects_header_2: "Proiecte (Top 3)"
+ projects_blurb: "Evidențiază-ți proiectele să impresionezi angajatorii."
+ project_name: "Numele Proiectului"
+ project_name_help: "Cum s-a numit proiectul?"
+ project_description: "Descriere"
+ project_description_help: "Descrie pe scurt proiectul."
+ project_picture: "Poză"
+ project_picture_help: "Uploadează o poză de 230x115px sau mai mare cu proiectul."
+ project_link: "Link"
+ project_link_help: "Link la proiect."
+ player_code: "Codul Jucătorului"
-# employers:
-# deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
-# deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
-# hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-# get_started: "Get Started"
-# already_screened: "We've already technically screened all our candidates"
-# filter_further: ", but you can also filter further:"
-# filter_visa: "Visa"
-# filter_visa_yes: "US Authorized"
-# filter_visa_no: "Not Authorized"
-# filter_education_top: "Top School"
-# filter_education_other: "Other"
-# filter_role_web_developer: "Web Developer"
-# filter_role_software_developer: "Software Developer"
-# filter_role_mobile_developer: "Mobile Developer"
-# filter_experience: "Experience"
-# filter_experience_senior: "Senior"
-# filter_experience_junior: "Junior"
-# filter_experience_recent_grad: "Recent Grad"
-# filter_experience_student: "College Student"
-# filter_results: "results"
-# start_hiring: "Start hiring."
-# reasons: "Three reasons you should hire through us:"
-# everyone_looking: "Everyone here is looking for their next opportunity."
-# everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-# weeding: "Sit back; we've done the weeding for you."
-# weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
-# pass_screen: "They will pass your technical screen."
-# pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-# make_hiring_easier: "Make my hiring easier, please."
-# what: "What is CodeCombat?"
-# what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-# cost: "How much do we charge?"
-# cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-# candidate_name: "Name"
-# candidate_location: "Location"
-# candidate_looking_for: "Looking For"
-# candidate_role: "Role"
-# candidate_top_skills: "Top Skills"
-# candidate_years_experience: "Yrs Exp"
-# candidate_last_updated: "Last Updated"
-# candidate_who: "Who"
-# featured_developers: "Featured Developers"
-# other_developers: "Other Developers"
-# inactive_developers: "Inactive Developers"
+ employers:
+ deprecation_warning_title: "Ne pare rău, CodeCombat nu recrutează acum."
+ deprecation_warning: "Ne axăm pe nivelele pentru începători în loc să găsim dezvoltatori experți deocamdată."
+ hire_developers_not_credentials: "Angajează dezvoltatori, nu scrisori de acreditare." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
+ get_started: "Începe"
+ already_screened: "Deja am verificat tehnic toți candidați noștri"
+ filter_further: ", dar poți să filtrezi mai departe:"
+ filter_visa: "Viză"
+ filter_visa_yes: "US Autorizat"
+ filter_visa_no: "Neauthorized"
+ filter_education_top: "Top Școală"
+ filter_education_other: "Altele"
+ filter_role_web_developer: "Web Developer"
+ filter_role_software_developer: "Software Developer"
+ filter_role_mobile_developer: "Mobile Developer"
+ filter_experience: "Experiență"
+ filter_experience_senior: "Senior"
+ filter_experience_junior: "Junior"
+ filter_experience_recent_grad: "Grad Recent"
+ filter_experience_student: "Student Facultate"
+ filter_results: "rezultate"
+ start_hiring: "Începe angajările."
+ reasons: "Trei motive pentru care să angajezi prin intermediul nostru:"
+ everyone_looking: "Toți de aici caută următoarea oportunitate."
+ everyone_looking_blurb: "Uită de 20% răspunsuri pe LinkedIn InMail. Toți cei pe care îi listăm pe acest site vor să își găsească următoarea poziție și vor răspunde la cerere cu o introducere. "
+ weeding: "Relaxsează-te; noi ne ocupăm de selecții."
+ weeding_blurb: "Fiecare jucător pe care îl listăm aici i-au fost testate abilitățile tehnice. De asemenea îi selecționăm telefonic și facem notițe despre profilul fiecăruia ca să iți economisim timpul."
+ pass_screen: "O să treacă examenul dvs. tehnic."
+ pass_screen_blurb: "Examinați codul fiecărui candidat înainte să îi contactați. Un angajator a constatat că de 5 ori mai mulți dezvoltatori au trecut examenul tehnic decât cei angajați de pe Hacker News."
+ make_hiring_easier: "Fă angajarea mai ușoară, te rugăm."
+ what: "Ce este CodeCombat?"
+ what_blurb: "CodeCombat este un joc multiplayer în browser ce te învața programare. Jucătorii scriu cod ca să iși controleze forțele împotriva celorlalți Dezvoltatori."
+ cost: "Căt de mult taxăm?"
+ cost_blurb: "Percepem 15% din salariul pe primul an si oferim o garanție 100% bani inapoi pentru 90 de zile. Nu taxăm candidați care sunt în cursul unui interviu la o companie."
+ candidate_name: "Nume"
+ candidate_location: "Locație"
+ candidate_looking_for: "Caută"
+ candidate_role: "Rol"
+ candidate_top_skills: "Top Skills"
+ candidate_years_experience: "Exp Ani"
+ candidate_last_updated: "Ultimul Update"
+ candidate_who: "Cine"
+ featured_developers: "Dezvoltatori Featured"
+ other_developers: "Alți Dezvoltatori"
+ inactive_developers: "Dezvoltatori Inactivi"
admin:
-# av_espionage: "Espionage" # Really not important to translate /admin controls.
-# av_espionage_placeholder: "Email or username"
-# av_usersearch: "User Search"
-# av_usersearch_placeholder: "Email, username, name, whatever"
-# av_usersearch_search: "Search"
- av_title: "Admin vede"
+ av_espionage: "Spionaj" # Really not important to translate /admin controls.
+ av_espionage_placeholder: "Email sau username"
+ av_usersearch: "Căutare user"
+ av_usersearch_placeholder: "Email, username, nume, orice"
+ av_usersearch_search: "Caută"
+ av_title: "Afișaj Admin"
av_entities_sub_title: "Entități"
av_entities_users_url: "Utilizatori"
av_entities_active_instances_url: "Instanțe active"
-# av_entities_employer_list_url: "Employer List"
-# av_entities_candidates_list_url: "Candidate List"
-# av_entities_user_code_problems_list_url: "User Code Problems List"
+ av_entities_employer_list_url: "Lista Angajatoriilor"
+ av_entities_candidates_list_url: "Lista Candidațiilor"
+ av_entities_user_code_problems_list_url: "Listă probleme de cod de utilizator"
av_other_sub_title: "Altele"
av_other_debug_base_url: "Base (pentru debugging base.jade)"
u_title: "Listă utilizatori"
-# ucp_title: "User Code Problems"
+ ucp_title: "Probleme de cod de utilizator"
lg_title: "Ultimele jocuri"
clas: "CLAs"
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 1c732899b..d5677f37d 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -596,12 +596,12 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
intro_2: "Опыт не обязателен!"
free_title: "Сколько это стоит?"
cost_china: "Первые 5 уровней CodeCombat бесплатны в Китае. При оплате $9.99 в месяц вы получите доступ к последующим более чем 140 уровням на наших эксклюзивных серверах в Китае."
- free_1: "CodeCombat (его базовая часть) бесплатен! В наличии более 80 уровней, которые покрывают каждый концепт." # {change}
+ free_1: "В наличии более 80 БЕСПЛАТНЫХ уровней, которые покрывают каждый концепт."
free_2: "Месячная подписка предоставляет доступ к видео-урокам и дополнительным уровням."
teacher_subs_title: "Учителя получают бесплатные подписки!"
- teacher_subs_1: "Пожалуйста, напишите на" # {change}
- teacher_subs_2: "для получения бесплатной месячной подписки." # {change}
-# teacher_subs_3: "to set up your subscription."
+ teacher_subs_1: "Пожалуйста, заполните нашу"
+ teacher_subs_2: "Анкету учителя"
+ teacher_subs_3: "для настройки вашей подписки."
sub_includes_title: "Что включено в подписку?"
sub_includes_1: "В дополнение к более чем 80 бесплатным уровням ученики с месячной подпиской получат доступ к дополнительным возможностям:"
sub_includes_2: "Более 60 уровней для дополнительной практики"
@@ -641,32 +641,33 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
sys_requirements_1: "Современный веб-браузер. Последние версии Chrome, Firefox или Safari. Internet Explorer 9 или новее."
sys_requirements_2: "CodeCombat пока не доступен на iPad."
-# teachers_survey:
-# title: "Teacher Survey"
-# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
-# retrieving: "Retrieving information..."
-# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
-# approved_1: "Your application for a free trial subscription was"
-# approved_2: "approved."
-# approved_3: "Further instructions have been sent to"
-# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
-# contact_1: "Please contact"
-# contact_2: "if you have further questions."
-# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
-# description_2: "teachers"
-# description_3: "page."
-# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
-# email: "Email Address"
-# school_city: "Name of School, City"
-# age_students: "How old are your students?"
-# under: "Under"
-# other: "Other:"
-# amount_students: "How many students do you teach?"
-# hear_about: "How did you hear about CodeCombat?"
-# fill_fields: "Please fill out all fields."
-# thanks: "Thanks! We'll send you setup instructions shortly."
+ teachers_survey:
+ title: "Анкета учителя"
+ must_be_logged: "Сначала необходимо войти в аккаунт. Пожалуйста, создайте аккаунт или войдите через меню вверху."
+ retrieving: "Получение информации..."
+ being_reviewed_1: "Ваша заявка на бесплатную пробную подписку сейчас"
+ being_reviewed_2: "на рассмотрении." # {change}
+ approved_1: "Ваша заявка на бесплатную пробную подписку была"
+ approved_2: "утверждена." # {change}
+ approved_3: "Дальнейшие инструкции были высланы на"
+ denied_1: "Ваша заявка на бесплатную пробную подписку была"
+ denied_2: "отклонена." # {change}
+ contact_1: "Пожалуйста, свяжитесь с"
+ contact_2: ", если у вас остались вопросы."
+ description_1: "Мы предлагаем бесплатные подписки учителям в целях ознакомления. Вы можете найти больше информации на нашей странице"
+ description_2: "учителей"
+ description_3: ""
+ description_4: "Пожалуйста, заполните эту маленькую анкету и мы вышлем вам инструкции по установке на email."
+ email: "Email-адрес"
+ school: "Наименование школы"
+ location: "Наименование города"
+ age_students: "Сколько лет вашим студентам?"
+ under: "Меньше"
+ other: "Другое:"
+ amount_students: "Как много студентов вы обучаете?"
+ hear_about: "Как вы узнали о CodeCombat?"
+ fill_fields: "Пожалуйста, заполните все поля."
+ thanks: "Спасибо! Скоро мы вышлем вам инструкцию по установке."
versions:
save_version_title: "Сохранить новую версию"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
picture_tab: "Аватар"
delete_account_tab: "Удалить ваш аккаунт"
wrong_email: "Неверный email"
+ wrong_password: "Неверный пароль"
upload_picture: "Загрузить изображение"
delete_this_account: "Удалить этот аккаунт навсегда"
god_mode: "Режим бога"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
admin: "Админ"
new_password: "Новый пароль"
new_password_verify: "Подтверждение пароля"
- type_in_email: "Введите ваш email для подтверждения удаления"
+ type_in_email: "Введите ваш email для подтверждения удаления аккаунта"
+ type_in_password: "Так же введите ваш пароль"
email_subscriptions: "Email-подписки"
email_subscriptions_none: "Нет активных подписок."
email_announcements: "Оповещения"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
keyboard_shortcuts: "Горячие клавиши"
space: "Пробел"
enter: "Enter"
+ press_enter: "нажмите enter"
escape: "Escape"
shift: "Shift"
run_code: "Выполнить текущий код."
diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee
index 74e54b9e5..7dfb14e98 100644
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
picture_tab: "Obrázok"
delete_account_tab: "Zruš svoj účet"
wrong_email: "Nesprávny email"
+# wrong_password: "Wrong Password"
upload_picture: "Nahraj obrázok"
delete_this_account: "Vymaž natrvalo tento účet"
god_mode: "Božský mód"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
new_password: "Nové heslo"
new_password_verify: "Overenie"
type_in_email: "Zadaj email na potvrdenie zrušenia účtu"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Odoberať emailom"
email_subscriptions_none: "Žiadne odoberanie emailom."
email_announcements: "Oznámenia"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee
index 050bc953e..2e26bf97a 100644
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee
index 7863a43e2..4e9a24907 100644
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
picture_tab: "Фотографија"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
# admin: "Admin"
new_password: "Нова Шифра"
new_password_verify: "Потврди"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Мејл претплате"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Обавештења"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee
index ae7f9f260..eae6aa444 100644
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
picture_tab: "Profilbild"
delete_account_tab: "Ta bort ditt konto"
wrong_email: "Fel mejladress"
+# wrong_password: "Wrong Password"
upload_picture: "Ladda upp en bild"
delete_this_account: "Ta bort det här kontot för alltid"
# god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
new_password: "Nytt lösenord"
new_password_verify: "Verifiera"
type_in_email: "Skriv in din mejladress för att bekräfta borttagandet"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Mejlprenumerationer"
email_subscriptions_none: "Inga mejlprenumerationer."
email_announcements: "Meddelanden"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
keyboard_shortcuts: "Kortkommandon"
space: "Mellanslag"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: "Kör nuvarande kod."
diff --git a/app/locale/th.coffee b/app/locale/th.coffee
index 3d8cf41c7..ccc6161e6 100644
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
picture_tab: "รูปภาพ"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
# admin: "Admin"
new_password: "รหัสผ่านใหม่"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "ประกาศ"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee
index da4641f27..159944cd7 100644
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
picture_tab: "Resim"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Bir Resim Yükle"
# delete_this_account: "Delete this account permanently"
god_mode: "Tanrı Kipi"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
admin: "Yönetici"
new_password: "Yeni Şifre"
new_password_verify: "Teyit Et"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "E-posta Abonelikleri"
email_subscriptions_none: "E-posta aboneliği yok."
email_announcements: "Duyurular"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
keyboard_shortcuts: "Klavye Kısayolları"
space: "Boşluk"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "ÜstKarakter"
run_code: "Geçerli kodu çalıştır."
diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee
index 6afe623db..922877db6 100644
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
retrostyle_blurb: "Ігри в стилі ретро"
teachers:
- title: "CodeCombat для вчителів" # {change}
+ title: "CodeCombat для вчителів"
intro_1: "CodeCombat - це онлайн гра, що вчить програмуванню. Студенти пишуть код на реальних мовах програмування."
intro_2: "Досвід не потрібен!"
free_title: "Скільки це коштує?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Українська", englishDescription:
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Українська", englishDescription:
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
picture_tab: "Аватар"
delete_account_tab: "Вилучити свій акаунт"
wrong_email: "Неправильний email"
+# wrong_password: "Wrong Password"
upload_picture: "Відвантажити зображення"
delete_this_account: "Вилучити цей акаунт назовсім"
god_mode: "Режим Бога"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
new_password: "Новий пароль"
new_password_verify: "Підтвердження паролю"
type_in_email: "Введіть свій email, щоб підтвердити вилучення"
+# type_in_password: "Also, type in your password."
email_subscriptions: "Email-підписки"
email_subscriptions_none: "Жодних підписок."
email_announcements: "Оголошення"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
keyboard_shortcuts: "Клавіатурні скорочення"
space: "Пробіл"
enter: "Enter"
+# press_enter: "press enter"
escape: "Escape"
shift: "Shift"
run_code: "Виконати поточний код."
diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee
index 884d4582a..509cda2d8 100644
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/uz.coffee b/app/locale/uz.coffee
index 939e9d25e..ace19ea29 100644
--- a/app/locale/uz.coffee
+++ b/app/locale/uz.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee
index 7b6397cb3..aab7a3875 100644
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
# retrostyle_blurb: "RetroStyle Games"
teachers:
- title: "Thông tin về CodeCombat dành cho giáo viên" # {change}
+ title: "Thông tin về CodeCombat dành cho giáo viên"
# intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
# intro_2: "No experience required!"
# free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
picture_tab: "Bức tranh"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
upload_picture: "Tải ảnh lên"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
admin: "Admin"
new_password: "Mật khẩu mới"
new_password_verify: "Xác nhận"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "Thuê bao Email"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "Thông báo"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
keyboard_shortcuts: "Các phím tắt"
space: "Phím Space"
enter: "Phím Enter"
+# press_enter: "press enter"
escape: "Phím Escape"
shift: "Phím Shift"
# run_code: "Run current code."
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 14c84736d..40efc645d 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
# retrostyle_blurb: "RetroStyle Games"
teachers:
- title: "CodeCombat给教师的说明" # {change}
+ title: "CodeCombat给教师的说明"
intro_1: "CodeCombat 是一个教编程的网上游戏。学生会用编程语言写代码。"
intro_2: "无需经验!"
free_title: "要多少钱?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
picture_tab: "图片"
delete_account_tab: "删除账户"
wrong_email: "错误的邮箱地址"
+# wrong_password: "Wrong Password"
upload_picture: "上传一张图片"
delete_this_account: "永久删除账户"
god_mode: "上帝模式"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
new_password: "新密码"
new_password_verify: "核实"
type_in_email: "输入你的邮箱地址来确认删除"
+# type_in_password: "Also, type in your password."
email_subscriptions: "邮箱订阅"
email_subscriptions_none: "取消订阅"
email_announcements: "通知"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
keyboard_shortcuts: "快捷键"
space: "空格"
enter: "回车"
+# press_enter: "press enter"
escape: "Esc"
shift: "Shift"
run_code: "运行当前代码"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 928fe2c21..0b50442df 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
# retrostyle_blurb: "RetroStyle Games"
teachers:
- title: "CodeCombat致教師的說明" # {change}
+ title: "CodeCombat致教師的說明"
# intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
# intro_2: "No experience required!"
# free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
picture_tab: "頭像"
delete_account_tab: "刪除您的帳戶"
wrong_email: "錯誤的Email"
+# wrong_password: "Wrong Password"
upload_picture: "上傳圖片"
delete_this_account: "永久性的刪除帳戶"
god_mode: "上帝模式"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
new_password: "新密碼"
new_password_verify: "確認密碼"
type_in_email: "輸入您的Email來確認刪除"
+# type_in_password: "Also, type in your password."
email_subscriptions: "訂閱"
email_subscriptions_none: "無Email訂閱"
email_announcements: "通知"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
keyboard_shortcuts: "鍵盤快捷鍵"
space: "Space"
enter: "Enter"
+# press_enter: "press enter"
escape: "Esc"
shift: "Shift"
run_code: "執行當前腳本"
diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee
index a455159e8..2108959cf 100644
--- a/app/locale/zh-WUU-HANS.coffee
+++ b/app/locale/zh-WUU-HANS.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
# picture_tab: "Picture"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
# admin: "Admin"
# new_password: "New Password"
# new_password_verify: "Verify"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
# email_subscriptions: "Email Subscriptions"
# email_subscriptions_none: "No Email Subscriptions."
# email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee
index 5f4fda86e..7e3a92fdc 100644
--- a/app/locale/zh-WUU-HANT.coffee
+++ b/app/locale/zh-WUU-HANT.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
# must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
# retrieving: "Retrieving information..."
# being_reviewed_1: "Your application for a free trial subscription is being"
-# being_reviewed_2: "reviewed"
+# being_reviewed_2: "reviewed."
# approved_1: "Your application for a free trial subscription was"
# approved_2: "approved."
# approved_3: "Further instructions have been sent to"
# denied_1: "Your application for a free trial subscription has been"
-# denied_2: "denied"
+# denied_2: "denied."
# contact_1: "Please contact"
# contact_2: "if you have further questions."
# description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
# description_3: "page."
# description_4: "Please fill out this quick survey and we’ll email you setup instructions."
# email: "Email Address"
-# school_city: "Name of School, City"
+# school: "Name of School"
+# location: "Name of City"
# age_students: "How old are your students?"
# under: "Under"
# other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
picture_tab: "圖片"
# delete_account_tab: "Delete Your Account"
# wrong_email: "Wrong Email"
+# wrong_password: "Wrong Password"
# upload_picture: "Upload a picture"
# delete_this_account: "Delete this account permanently"
# god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
admin: "管理"
new_password: "新密碼"
new_password_verify: "覈實"
-# type_in_email: "Type in your email to confirm the deletion"
+# type_in_email: "Type in your email to confirm account deletion."
+# type_in_password: "Also, type in your password."
email_subscriptions: "郵箱校對"
# email_subscriptions_none: "No Email Subscriptions."
email_announcements: "通知"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
# keyboard_shortcuts: "Keyboard Shortcuts"
# space: "Space"
# enter: "Enter"
+# press_enter: "press enter"
# escape: "Escape"
# shift: "Shift"
# run_code: "Run current code."
diff --git a/app/schemas/models/campaign.schema.coffee b/app/schemas/models/campaign.schema.coffee
index eae2985dc..5fba3ba9f 100644
--- a/app/schemas/models/campaign.schema.coffee
+++ b/app/schemas/models/campaign.schema.coffee
@@ -115,6 +115,7 @@ _.extend CampaignSchema.properties, {
campaign: c.shortString title: 'Campaign', description: 'Which campaign this level is part of (like "desert").', format: 'hidden' # Automatically set by campaign editor.
tasks: c.array {title: 'Tasks', description: 'Tasks to be completed for this level.'}, c.task
+ concepts: c.array {title: 'Programming Concepts', description: 'Which programming concepts this level covers.'}, c.concept
#- normal properties
position: c.point2d()
diff --git a/app/schemas/models/level.coffee b/app/schemas/models/level.coffee
index 1a49a0eaf..e1bb882e8 100644
--- a/app/schemas/models/level.coffee
+++ b/app/schemas/models/level.coffee
@@ -263,6 +263,7 @@ LevelSchema = c.object {
{id: 'ogres-die', name: 'Ogres must die.', killThangs: ['ogres'], worldEndsAfter: 3}
{id: 'humans-survive', name: 'Your hero must survive.', saveThangs: ['Hero Placeholder'], howMany: 1, worldEndsAfter: 3, hiddenGoal: true}
]
+ concepts: ['basic_syntax']
}
c.extendNamedProperties LevelSchema # let's have the name be the first property
_.extend LevelSchema.properties,
@@ -344,6 +345,7 @@ _.extend LevelSchema.properties,
campaign: c.shortString title: 'Campaign', description: 'Which campaign this level is part of (like "desert").', format: 'hidden' # Automatically set by campaign editor.
scoreTypes: c.array {title: 'Score Types', description: 'What metric to show leaderboards for.', uniqueItems: true},
c.shortString(title: 'Score Type', 'enum': ['time', 'damage-taken', 'damage-dealt', 'gold-collected', 'difficulty']) # TODO: good version of LoC; total gear value.
+ concepts: c.array {title: 'Programming Concepts', description: 'Which programming concepts this level covers.', uniqueItems: true}, c.concept
c.extendBasicProperties LevelSchema, 'level'
diff --git a/app/schemas/schemas.coffee b/app/schemas/schemas.coffee
index 8240f2e8b..c9437860b 100644
--- a/app/schemas/schemas.coffee
+++ b/app/schemas/schemas.coffee
@@ -235,3 +235,24 @@ me.RewardSchema = (descriptionFragment='earned by achievements') ->
me.task = me.object {title: 'Task', description: 'A task to be completed', format: 'task', default: {name: 'TODO', complete: false}},
name: {title: 'Name', description: 'What must be done?', type: 'string'}
complete: {title: 'Complete', description: 'Whether this task is done.', type: 'boolean', format: 'checkbox'}
+
+me.concept = me.shortString enum: [
+ 'advanced_strings'
+ 'algorithms'
+ 'arithmetic'
+ 'arrays'
+ 'basic_syntax'
+ 'boolean_logic'
+ 'break_statements'
+ 'classes'
+ 'for_loops'
+ 'functions'
+ 'if_statements'
+ 'input_handling'
+ 'math_operations'
+ 'object_literals'
+ 'strings'
+ 'variables'
+ 'vectors'
+ 'while_loops'
+ ]
diff --git a/app/styles/courses/mock1/course-details.sass b/app/styles/courses/mock1/course-details.sass
new file mode 100644
index 000000000..4af6a9895
--- /dev/null
+++ b/app/styles/courses/mock1/course-details.sass
@@ -0,0 +1,7 @@
+#course-details-view
+
+ .textarea-emails
+ width: 50%
+
+ .select-language
+ width: 200px
diff --git a/app/styles/courses/mock1/course-enroll.sass b/app/styles/courses/mock1/course-enroll.sass
new file mode 100644
index 000000000..388a10915
--- /dev/null
+++ b/app/styles/courses/mock1/course-enroll.sass
@@ -0,0 +1,11 @@
+#course-enroll-view
+
+ .btn-buy
+ margin: 20px 0px
+
+ .center
+ text-align: center
+
+ .enroll-container
+ margin: 5% 20%
+ width: 60%
diff --git a/app/styles/courses/mock1/course-info.sass b/app/styles/courses/mock1/course-info.sass
new file mode 100644
index 000000000..5e6592cb3
--- /dev/null
+++ b/app/styles/courses/mock1/course-info.sass
@@ -0,0 +1,18 @@
+#course-info-view
+
+ .center
+ text-align: center
+
+ .contact-container
+ margin-top: 20px
+ text-align: center
+
+ .info-container
+ margin: 0% 10%
+
+ .praise-quote
+ font-size: 24px
+ font-style: italic
+
+ .praise-source
+ font-size: 16px
diff --git a/app/styles/courses/mock1/courses.sass b/app/styles/courses/mock1/courses.sass
new file mode 100644
index 000000000..f0b2d79af
--- /dev/null
+++ b/app/styles/courses/mock1/courses.sass
@@ -0,0 +1,11 @@
+#courses-view
+
+ .center
+ text-align: center
+
+ .course-panel
+ margin: 20px
+
+ .button-row
+ margin-top: 20px
+ text-align: center
diff --git a/app/styles/mixins.sass b/app/styles/mixins.sass
index a010728da..833c5b564 100644
--- a/app/styles/mixins.sass
+++ b/app/styles/mixins.sass
@@ -72,7 +72,7 @@
-webkit-flex: $values
-ms-flex: $values
flex: $values
-
+
@mixin order($val)
-webkit-box-ordinal-group: $val
-moz-box-ordinal-group: $val
@@ -114,7 +114,7 @@
-ms-box-orient: vertical
-webkit-flex-direction: column
-ms-flex-direction: column
- -flex-direction: column
+ flex-direction: column
@mixin scaleX($ratio)
-webkit-transform: scaleX($ratio)
diff --git a/app/styles/play/campaign-view.sass b/app/styles/play/campaign-view.sass
index 6f358bd6e..9611133cd 100644
--- a/app/styles/play/campaign-view.sass
+++ b/app/styles/play/campaign-view.sass
@@ -238,6 +238,11 @@ $gameControlMargin: 30px
margin: 0px auto
max-width: 100%
+ kbd
+ margin: 0 2px 2px 0
+ display: inline-block
+ font-size: 12px
+
.level-status
background: transparent url(/images/pages/play/level-info-status-spritesheet.png) no-repeat 0 0
width: 60px
diff --git a/app/styles/play/ladder/ladder-tab-view.sass b/app/styles/play/ladder/ladder-tab-view.sass
index 6d1efc15e..b510c3655 100644
--- a/app/styles/play/ladder/ladder-tab-view.sass
+++ b/app/styles/play/ladder/ladder-tab-view.sass
@@ -1,6 +1,6 @@
#ladder-tab-view
.name-col-cell
- max-width: 150px
+ max-width: 100px
white-space: nowrap
overflow: hidden
text-overflow: ellipsis
diff --git a/app/styles/play/ladder/ladder.sass b/app/styles/play/ladder/ladder.sass
index 1934af990..aa04a6afb 100644
--- a/app/styles/play/ladder/ladder.sass
+++ b/app/styles/play/ladder/ladder.sass
@@ -75,7 +75,7 @@
color: white
.name-col-cell
- max-width: 150px
+ max-width: 100px
text-overflow: ellipsis
white-space: nowrap
overflow: hidden
diff --git a/app/templates/about.jade b/app/templates/about.jade
index 8fbf2577f..e156b4e9e 100644
--- a/app/templates/about.jade
+++ b/app/templates/about.jade
@@ -48,17 +48,14 @@ block content
span(data-i18n="about.press_paragraph_1_suffix")
| . All logos and images may be used without contacting us directly.
- h2(data-i18n="about.contact_title")
+ h2(data-i18n="nav.contact")
| Contact
p
- span(data-i18n="about.codecombat_inc")
- | CodeCombat, Inc.
+ span CodeCombat, Inc.
br
- span(data-i18n="about.address_part_1")
- | 188 King St #507
+ span 188 King St #507
br
- span(data-i18n="about.address_part_2")
- | San Francisco, CA 94107
+ span San Francisco, CA 94107
br
a(href='mailto:team@codecombat.com') team@codecombat.com
diff --git a/app/templates/account/account-settings-root-view.jade b/app/templates/account/account-settings-root-view.jade
index 89f07eca5..feae7db6b 100644
--- a/app/templates/account/account-settings-root-view.jade
+++ b/app/templates/account/account-settings-root-view.jade
@@ -12,8 +12,8 @@ block content
if !me.get('anonymous', true)
#save-button-container
- button#save-button.btn-lg.btn.disabled(data-i18n="general.save" disabled="true") No Changes
+ button#save-button.btn-lg.btn.disabled(data-i18n="delta.no_changes" disabled="true") No Changes
#account-settings-view
-block footer
\ No newline at end of file
+block footer
diff --git a/app/templates/account/account-settings-view.jade b/app/templates/account/account-settings-view.jade
index 980af0464..ca871ef2a 100644
--- a/app/templates/account/account-settings-view.jade
+++ b/app/templates/account/account-settings-view.jade
@@ -54,9 +54,12 @@ else
.panel-body
.form
.form-group
- label.control-label(for="email1", data-i18n="account_settings.type_in_email") Type in your email to confirm the deletion
+ label.control-label(for="email1", data-i18n="account_settings.type_in_email")
input#email1.form-control(name="email1", type="text")
- button#delete-account-button.btn.form-control.btn-primary(data-i18n="account_settings.delete_this_account")
+ .form-group
+ label.control-label(for="password1", data-i18n="account_settings.type_in_password")
+ input#password1.form-control(name="password1", type="password")
+ button#delete-account-button.btn.form-control.btn-primary(data-i18n="account_settings.delete_this_account")
.col-md-6
diff --git a/app/templates/courses/mock1/course-details.jade b/app/templates/courses/mock1/course-details.jade
new file mode 100644
index 000000000..791bbad83
--- /dev/null
+++ b/app/templates/courses/mock1/course-details.jade
@@ -0,0 +1,77 @@
+extends /templates/base
+
+block content
+
+ //- DO NOT localize / i18n
+
+ div
+ span *UNDER CONSTRUCTION, send feedback to
+ a.spl(href='mailto:team@codecombat.com') team@codecombat.com
+ div
+ input(type='checkbox')
+ span.spl Student view
+ div TODO: edit button for class name
+ div TODO: description field
+ div TODO: fix ugly tabs
+ div TODO: add student progress monitoring
+ div TODO: level concepts, status, working play button
+ div TODO: select course session
+ div TODO: no unlock code or capacity limit for first course
+ div TODO: student view
+ div(style='border-bottom: 1px solid black')
+
+ h1= course.title
+ p Class name: #{instance.name}
+
+ p Select programming languages available to students.
+ .form-group
+ select.form-control.select-language
+ option(value="Python") Python
+ option(value="JavaScript") JavaScript
+ option(value="All Languages") All Languages
+
+ div(role='tabpanel')
+ ul.nav.nav-tabs(role='tablist')
+ li.active(role='presentation')
+ a(href='#progress', aria-controls='progress', role='tab', data-toggle='tab') Students
+ li(role='presentation')
+ a(href='#invite', aria-controls='invite', role='tab', data-toggle='tab') Add Students
+ li(role='presentation')
+ a(href='#levels', aria-controls='levels', role='tab', data-toggle='tab') Levels
+
+ .tab-content
+ .tab-pane.active#progress(role='tabpanel')
+ if instance.students
+ table.table.table-condensed
+ thead
+ tr
+ th Name
+ th Progress
+ tbody
+ each student in instance.students
+ tr
+ td
+ a= student
+ td TODO: level progress
+
+ .tab-pane#invite(role='tabpanel')
+ p Invite students to join this class.
+ p Student unlock code: #{instance.code}
+ p Class capacity: 34/50
+
+ textarea.textarea-emails(rows=3, placeholder="Enter student emails to invite, one per line")
+ div
+ button.btn.btn-success.btn-invite Send Invites
+ .tab-pane#levels(role='tabpanel')
+ table.table.table-condensed
+ thead
+ tr
+ th Level
+ th
+ tbody
+ each level in course.levels
+ tr
+ td
+ spa= level
+ td
+ button.btn.btn-success Play
diff --git a/app/templates/courses/mock1/course-enroll.jade b/app/templates/courses/mock1/course-enroll.jade
new file mode 100644
index 000000000..c17a9cd9f
--- /dev/null
+++ b/app/templates/courses/mock1/course-enroll.jade
@@ -0,0 +1,73 @@
+extends /templates/base
+
+block content
+
+ //- DO NOT localize / i18n
+
+ div
+ span *UNDER CONSTRUCTION, send feedback to
+ a.spl(href='mailto:team@codecombat.com') team@codecombat.com
+ div TODO: figure out correct terminology. Someone should probably purchase a course, and then enroll their students.
+ div TODO: move details off button and into clear 'this is what you are purchasing' blurb
+ div TODO: individual teacher trial option
+ div(style='border-bottom: 1px solid black')
+
+ .well.well-lg.enroll-container
+ h1.center Enroll
+ h3 1. Course
+ p Select 'All Courses' to recieve up to a 70% discount!
+ .form-group
+ select.form-control.course-select
+ each course in courses
+ if course.title !== 'Introduction to Computer Science'
+ option(value="#{course.title}")= course.title
+ option(value="All Courses") All Courses
+ h3 2. Number of students
+ .quantity-container(style="width:50%;")
+ .radio
+ label
+ if quantity === 20
+ input(type='radio', name='quantity', data-quantity=20, checked=true)
+ else
+ input(type='radio', name='quantity', data-quantity=20)
+ if selectedCourseTitle === 'All Courses'
+ span Up to 20 students $499
+ else
+ span Up to 20 students $99
+ .radio
+ label
+ if quantity === 50
+ input(type='radio', name='quantity', data-quantity=50, checked=true)
+ else
+ input(type='radio', name='quantity', data-quantity=50)
+ if selectedCourseTitle === 'All Courses'
+ span Up to 50 students $999
+ else
+ span Up to 50 students $199
+ .radio
+ label
+ if quantity === 100
+ input(type='radio', name='quantity', data-quantity=100, checked=true)
+ else
+ input(type='radio', name='quantity', data-quantity=100)
+ if selectedCourseTitle === 'All Courses'
+ span Up to 100 students $1499
+ else
+ span Up to 100 students $349
+ .radio
+ label
+ if quantity === 500
+ input(type='radio', name='quantity', data-quantity=500, checked=true)
+ else
+ input(type='radio', name='quantity', data-quantity=500)
+ if selectedCourseTitle === 'All Courses'
+ span Up to 500 students $2999
+ else
+ span Up to 500 students $799
+ h3 3. Finish Purchase
+ p After purchase you will be able to invite your students to enroll in the selected course.
+ p.center
+ button.btn.btn-info.btn-lg.btn-buy Buy #{selectedCourseTitle} for $#{price}
+ p.center
+ span For any questions, please contact
+ a.spl(href='mailto:team@codecombat.com') team@codecombat.com
diff --git a/app/templates/courses/mock1/course-info.jade b/app/templates/courses/mock1/course-info.jade
new file mode 100644
index 000000000..bb72a5255
--- /dev/null
+++ b/app/templates/courses/mock1/course-info.jade
@@ -0,0 +1,46 @@
+extends /templates/base
+
+block content
+
+ //- DO NOT localize / i18n
+
+ div
+ span *UNDER CONSTRUCTION, send feedback to
+ a.spl(href='mailto:team@codecombat.com') team@codecombat.com
+ div TODO: update images, add captions
+ div TODO: Add real marketing copy.
+ div(style='border-bottom: 1px solid black; margin-bottom: 20px')
+
+
+ .well.info-container
+ h1.center= course.title
+
+ p.center.gameplay-img-container
+ img(src='/images/pages/about/coco_comic.jpg' width='700')
+ p= course.description
+ p
+ span There is approximately
+ strong.spl 5 hours
+ span.spl of content.
+
+ h3 Topics
+ ul
+ each topic in course.topics
+ li= topic
+
+ p
+ div.praise-quote "#{praise.quote}"
+ div.praise-source - #{praise.source}
+
+ h3 Extras
+ p There are help videos and premium email support
+ p.center.monitoring-img-container
+ img(src='/images/pages/clans/dashboard_preview.png' width='700')
+ p There is detailed student progress monitoring.
+
+ p.center
+ button.btn.btn-info.btn-lg.btn-enroll(data-course-id="#{courseID}") Enroll
+
+ p.contact-container
+ span For more information, please contact
+ a.spl(href='mailto:team@codecombat.com') team@codecombat.com
diff --git a/app/templates/courses/mock1/courses.jade b/app/templates/courses/mock1/courses.jade
new file mode 100644
index 000000000..5eb132eef
--- /dev/null
+++ b/app/templates/courses/mock1/courses.jade
@@ -0,0 +1,44 @@
+extends /templates/base
+
+block content
+
+ //- DO NOT localize / i18n
+
+ div(style='border-bottom: 1px solid black')
+ span *UNDER CONSTRUCTION, send feedback to
+ a.spl(href='mailto:team@codecombat.com') team@codecombat.com
+
+ h1.center Courses
+ .container-fluid
+ - var i = 0
+ while i < courses.length
+ .row
+ +course-block(courses[i], i)
+ - i++
+ if i < courses.length
+ +course-block(courses[i], i)
+ - i++
+
+mixin course-block(course, courseID)
+ .col-md-6
+ .well.panel.course-panel(class=course.unlocked ? 'panel-success' : 'panel-info')
+ .panel-heading
+ .panel-title #{course.title} #{course.unlocked ? '(enrolled)' : ''}
+ .panel-body
+ strong Topics
+ ul
+ each topic in course.topics
+ li= topic
+ strong= course.duration
+ .container-fluid
+ .row.button-row
+ .col-md-4
+ //- Always show code unlock, because you can have multiple course instances
+ if courseID > 0
+ button.btn.btn-warning.btn-have-code(data-course-id="#{courseID}") I have a code
+ .col-md-4
+ if course.unlocked
+ button.btn.btn-success.btn-enter(data-course-id="#{courseID}") Enter
+ .col-md-4
+ if courseID > 0
+ button.btn.btn-info.btn-more-info(data-course-id="#{courseID}") More details
diff --git a/app/templates/editor/level/system/add.jade b/app/templates/editor/level/system/add.jade
index ec50744ae..443bd23ad 100644
--- a/app/templates/editor/level/system/add.jade
+++ b/app/templates/editor/level/system/add.jade
@@ -6,5 +6,5 @@ block modal-header-content
block modal-body-content
ul.available-systems-list
-block modal-footer-content
- button.btn.btn-primary(data-dismiss="modal") Done Adding
+block modal-footer-content
+ button.btn.btn-primary(data-dismiss="modal", data-i18n="editor.done_adding") Done Adding
diff --git a/app/templates/editor/modal/new-model-modal.jade b/app/templates/editor/modal/new-model-modal.jade
index d88e30568..1e6e78f4f 100644
--- a/app/templates/editor/modal/new-model-modal.jade
+++ b/app/templates/editor/modal/new-model-modal.jade
@@ -1,7 +1,7 @@
extends /templates/core/modal-base
block modal-header-content
- h3(data-i18n="#{currentNew}") Create New #{modelLabel}
+ h3(data-i18n="#{newModelTitle}") Create New #{modelLabel}
block modal-body-content
form.form
diff --git a/app/templates/editor/modal/save-version-modal.jade b/app/templates/editor/modal/save-version-modal.jade
index cfcae8cc3..03201a653 100644
--- a/app/templates/editor/modal/save-version-modal.jade
+++ b/app/templates/editor/modal/save-version-modal.jade
@@ -18,7 +18,7 @@ block modal-body-content
input#major-version(name="version-is-major", type="checkbox")
span(data-i18n="versions.new_major_version") New Major Version
else
- .alert.alert-danger No changes
+ .alert.alert-danger(data-i18n="delta.no_changes") No changes
block modal-body-wait-content
if hasChanges
@@ -30,13 +30,12 @@ block modal-body-wait-content
block modal-footer-content
if hasChanges
#accept-cla-wrapper.alert.alert-info
- span(data-i18n="versions.cla_prefix") To save changes, first you must agree to our
- |
+ span.spr(data-i18n="versions.cla_prefix") To save changes, first you must agree to our
strong#cla-link(data-i18n="versions.cla_url") CLA
span(data-i18n="versions.cla_suffix") .
button.btn.btn-sm#agreement-button(data-i18n="versions.cla_agree") I AGREE
if isPatch
- .alert.alert-info An owner will need to approve it before your changes will become visible.
+ .alert.alert-info(data-i18n="versions.owner_approve") An owner will need to approve it before your changes will become visible.
.buttons
button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel
diff --git a/app/templates/home-view.jade b/app/templates/home-view.jade
index c2b35420f..8ad164d34 100644
--- a/app/templates/home-view.jade
+++ b/app/templates/home-view.jade
@@ -17,7 +17,7 @@ block outer_content
.alert.alert-danger.lt-ie9
strong(data-i18n="home.no_ie") CodeCombat does not run in Internet Explorer 8 or older. Sorry!
- if isMobile
+ if isIPadBrowser || isMobile
.alert.alert-danger.mobile
strong(data-i18n="home.no_mobile") CodeCombat wasn't designed for mobile devices and may not work!
else if isOldBrowser
@@ -25,12 +25,10 @@ block outer_content
strong(data-i18n="home.old_browser") Uh oh, your browser is too old to run CodeCombat. Sorry!
br
span(data-i18n="home.old_browser_suffix") You can try anyway, but it probably won't work.
- else if isIPadBrowser
- .alert.alert-danger.ipad-browser
- strong(data-i18n="home.ipad_browser") Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval.
+
block extra_footer_content
- if explainHourOfCode
+ if explainHourOfCode
// Does not show up unless lang is en-US.
div.hour-of-code-explanation
| The 'Hour of Code' is a nationwide initiative by
diff --git a/app/templates/play/campaign-view.jade b/app/templates/play/campaign-view.jade
index ecb95043a..eb3e536df 100644
--- a/app/templates/play/campaign-view.jade
+++ b/app/templates/play/campaign-view.jade
@@ -39,6 +39,10 @@ if campaign
a.spr(href="/contribute/adventurer")
strong(data-i18n="play.awaiting_levels_adventurer") Sign up as an Adventurer
span.spl(data-i18n="play.awaiting_levels_adventurer_suffix") to be the first to play new levels.
+ if level.concepts && level.concepts.length
+ p
+ for concept in level.concepts
+ kbd(data-i18n="concepts." + concept)
if !level.disabled && !level.locked
if playCount && playCount.sessions
diff --git a/app/templates/play/menu/guide-view.jade b/app/templates/play/menu/guide-view.jade
index 1ff5cf8d0..4019ad7a0 100644
--- a/app/templates/play/menu/guide-view.jade
+++ b/app/templates/play/menu/guide-view.jade
@@ -30,10 +30,6 @@ if docs.length === 1
strong
a(class="resource-link", data-resource="code-school", href='http://mbsy.co/bVRsR') Code School
| : Learn web technologies with video lessons, coding challenges, and screencasts.
- li
- strong
- a(class="resource-link", data-resource="learnable", href='http://shrsl.com/?~80my') Learnable
- | : Learn web design, HTML, CSS, and so much more.
li
strong
a(class="resource-link", data-resource="pluralsight", href='http://shrsl.com/?~81i5') Pluralsight
diff --git a/app/templates/play/modal/play-account-modal.jade b/app/templates/play/modal/play-account-modal.jade
index 24c1df7df..a10afa8e8 100644
--- a/app/templates/play/modal/play-account-modal.jade
+++ b/app/templates/play/modal/play-account-modal.jade
@@ -7,4 +7,4 @@ block modal-body-content
#account-settings-view
block modal-footer-content
- #save-button.btn-lg.btn.disabled(data-i18n="general.save" disabled="true") No Changes
\ No newline at end of file
+ #save-button.btn-lg.btn.disabled(data-i18n="delta.no_changes" disabled="true") No Changes
diff --git a/app/templates/teachers-free-trial.jade b/app/templates/teachers-free-trial.jade
index 26960f2cb..4fae305b6 100644
--- a/app/templates/teachers-free-trial.jade
+++ b/app/templates/teachers-free-trial.jade
@@ -58,7 +58,7 @@ block content
input(type="radio", name="age", value="18+")
span.spl 18+
div
- input(type="radio", name="age", value='other')
+ input.radio-other(type="radio", name="age", value='other')
span.spl.spr(data-i18n="teachers_survey.other")
input.spr.input-age-other(type='text')
p.container-num-students
diff --git a/app/views/NotFoundView.coffee b/app/views/NotFoundView.coffee
new file mode 100644
index 000000000..4db47ebff
--- /dev/null
+++ b/app/views/NotFoundView.coffee
@@ -0,0 +1,6 @@
+RootView = require 'views/core/RootView'
+template = require 'templates/core/not-found'
+
+module.exports = class NotFoundView extends RootView
+ id: 'not-found-view'
+ template: template
diff --git a/app/views/TeachersFreeTrialView.coffee b/app/views/TeachersFreeTrialView.coffee
index 2ac210b6a..f26ae8c25 100644
--- a/app/views/TeachersFreeTrialView.coffee
+++ b/app/views/TeachersFreeTrialView.coffee
@@ -11,6 +11,7 @@ module.exports = class TeachersFreeTrialView extends RootView
events:
'click .submit-button': 'onClickSubmit'
+ 'click .input-age-other': 'onClickTextBox'
constructor: (options) ->
super options
@@ -32,6 +33,9 @@ module.exports = class TeachersFreeTrialView extends RootView
@render?()
@supermodel.loadCollection(@existingRequests, 'own_trial_requests', {cache: false})
+ onClickTextBox: (e) ->
+ $('.radio-other').prop("checked", true)
+
onClickSubmit: (e) ->
email = $('.input-email-address').val()
school = $('.input-school').val()
diff --git a/app/views/account/AccountSettingsView.coffee b/app/views/account/AccountSettingsView.coffee
index 5fc2c6690..6b4cf28b8 100644
--- a/app/views/account/AccountSettingsView.coffee
+++ b/app/views/account/AccountSettingsView.coffee
@@ -40,7 +40,7 @@ module.exports = class AccountSettingsView extends CocoView
#- Form input callbacks
onInputChanged: (e) ->
$(e.target).addClass 'changed'
- if (JSON.stringify(document.getElementById('email1').className)).indexOf("changed") > -1
+ if (JSON.stringify(document.getElementById('email1').className)).indexOf("changed") > -1 or (JSON.stringify(document.getElementById('password1').className)).indexOf("changed") > -1
$(e.target).removeClass 'changed'
else
@trigger 'input-changed'
@@ -67,26 +67,57 @@ module.exports = class AccountSettingsView extends CocoView
#- Just copied from OptionsView, TODO refactor
-
confirmAccountDeletion: ->
forms.clearFormAlerts(@$el)
- myEmail = me.get 'email'
+ myEmail = me.get 'email'
email1 = document.getElementById('email1').value
+ password1 = document.getElementById('password1').value
if Boolean(email1) and email1 is myEmail
- renderData =
- 'confirmTitle': 'Are you really sure?'
- 'confirmBody': 'This will completely delete your account. This action CANNOT be undone. Are you entirely sure?'
- 'confirmDecline': 'Not really'
- 'confirmConfirm': 'Definitely'
- confirmModal = new ConfirmModal renderData
- confirmModal.on 'confirm', @deleteAccount
- @openModalView confirmModal
+ isPasswordCorrect = false
+ toBeDelayed = true
+ $.ajax
+ url: '/auth/login'
+ type: 'POST'
+ data:
+ {
+ username: email1,
+ password: password1
+ }
+ parse: true
+ error: (error) ->
+ toBeDelayed = false
+ 'Bad Error. Can\'t connect to server or something. ' + error
+ success: (response, textStatus, jqXHR) ->
+ toBeDelayed = false
+ unless jqXHR.status is 200
+ return
+ isPasswordCorrect = true
+ callback = =>
+ if toBeDelayed
+ setTimeout callback, 100
+ else
+ if isPasswordCorrect
+ renderData =
+ 'confirmTitle': 'Are you really sure?'
+ 'confirmBody': 'This will completely delete your account. This action CANNOT be undone. Are you entirely sure?'
+ 'confirmDecline': 'Not really'
+ 'confirmConfirm': 'Definitely'
+ confirmModal = new ConfirmModal renderData
+ confirmModal.on 'confirm', @deleteAccount
+ @openModalView confirmModal
+ else
+ message = $.i18n.t('account_settings.wrong_password', defaultValue: 'Wrong Password.')
+ err = [message: message, property: 'password1', formatted: true]
+ forms.applyErrorsToForm(@$el, err)
+ $('.nano').nanoScroller({scrollTo: @$el.find('.has-error')})
+ setTimeout callback, 100
else
message = $.i18n.t('account_settings.wrong_email', defaultValue: 'Wrong Email.')
err = [message: message, property: 'email1', formatted: true]
forms.applyErrorsToForm(@$el, err)
$('.nano').nanoScroller({scrollTo: @$el.find('.has-error')})
+
deleteAccount: ->
myID = me.id
$.ajax
diff --git a/app/views/admin/AnalyticsSubscriptionsView.coffee b/app/views/admin/AnalyticsSubscriptionsView.coffee
index 44fc281ed..dce9818af 100644
--- a/app/views/admin/AnalyticsSubscriptionsView.coffee
+++ b/app/views/admin/AnalyticsSubscriptionsView.coffee
@@ -155,12 +155,16 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
# console.log 'updateAnalyticsGraphData'
# Build graphs based on available @analytics data
# Currently only one graph
- @analytics.graphs = [graphID: 'total-subs', lines: []]
-
- timeframeDays = 60
+ @analytics.graphs = []
return unless @subs?.length > 0
+ @addGraphData(60)
+ @addGraphData(180, true)
+
+ addGraphData: (timeframeDays, skipCancelled=false) ->
+ graph = {graphID: 'total-subs', lines: []}
+
# TODO: Where should this metadata live?
# TODO: lineIDs assumed to be unique across graphs
totalSubsID = 'total-subs'
@@ -168,6 +172,7 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
startedSubsID = 'started-subs'
cancelledSubsID = 'cancelled-subs'
netSubsID = 'net-subs'
+ averageNewID = 'average-new'
lineMetadata = {}
lineMetadata[totalSubsID] =
description: 'Total Active Subscriptions'
@@ -190,6 +195,10 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
description: '7-day Average Net Subscriptions (started - cancelled)'
color: 'black'
strokeWidth: 4
+ lineMetadata[averageNewID] =
+ description: '7-day Average New Subscriptions'
+ color: 'black'
+ strokeWidth: 4
days = (sub.day for sub in @subs)
if days.length > 0
@@ -228,7 +237,7 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
- @analytics.graphs[0].lines.push
+ graph.lines.push
lineID: totalSubsID
enabled: true
points: levelPoints
@@ -263,7 +272,7 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
- @analytics.graphs[0].lines.push
+ graph.lines.push
lineID: startedSubsID
enabled: true
points: levelPoints
@@ -273,122 +282,170 @@ module.exports = class AnalyticsSubscriptionsView extends RootView
min: 0
max: d3.max(@subs[-timeframeDays..], (d) -> d.started + 2)
- ## Total subs target
+ if skipCancelled
- # Build line data
- levelPoints = []
- for sub, i in @subs
- levelPoints.push
- x: i
- y: @targetSubCount
- day: sub.day
- pointID: "#{targetSubsID}#{i}"
- values: []
+ ## 7-Day average started
- levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
-
- @analytics.graphs[0].lines.push
- lineID: targetSubsID
- enabled: true
- points: levelPoints
- description: lineMetadata[targetSubsID].description
- lineColor: lineMetadata[targetSubsID].color
- strokeWidth: lineMetadata[targetSubsID].strokeWidth
- min: 0
- max: Math.max(@targetSubCount, d3.max(@subs, (d) -> d.total))
-
- ## Cancelled
-
- # TODO: move this average cancelled stuff up the chain
- averageCancelled = 0
-
- # Build line data
- levelPoints = []
- cancelled = []
- for sub, i in @subs[@subs.length - 30...]
- cancelled.push sub.cancelled
- levelPoints.push
- x: @subs.length - 30 + i
- y: sub.cancelled
- day: sub.day
- pointID: "#{cancelledSubsID}#{@subs.length - 30 + i}"
- values: []
- averageCancelled = cancelled.reduce((a, b) -> a + b) / cancelled.length
- for sub, i in @subs[0...-30]
- levelPoints.splice i, 0,
- x: i
- y: averageCancelled
- day: sub.day
- pointID: "#{cancelledSubsID}#{i}"
- values: []
-
- # Ensure points for each day
- for day, i in days
- if levelPoints.length <= i or levelPoints[i].day isnt day
- prevY = if i > 0 then levelPoints[i - 1].y else 0.0
- levelPoints.splice i, 0,
- y: prevY
- day: day
+ # Build line data
+ levelPoints = []
+ sevenStarts = []
+ for sub, i in @subs
+ average = 0
+ sevenStarts.push sub.started
+ if sevenStarts.length > 7
+ sevenStarts.shift()
+ if sevenStarts.length is 7
+ average = sevenStarts.reduce((a, b) -> a + b) / sevenStarts.length
+ levelPoints.push
+ x: i
+ y: average
+ day: sub.day
+ pointID: "#{averageNewID}#{i}"
values: []
- levelPoints[i].x = i
- levelPoints[i].pointID = "#{cancelledSubsID}#{i}"
- levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
+ # Ensure points for each day
+ for day, i in days
+ if levelPoints.length <= i or levelPoints[i].day isnt day
+ prevY = if i > 0 then levelPoints[i - 1].y else 0.0
+ levelPoints.splice i, 0,
+ y: prevY
+ day: day
+ values: []
+ levelPoints[i].x = i
+ levelPoints[i].pointID = "#{averageNewID}#{i}"
- @analytics.graphs[0].lines.push
- lineID: cancelledSubsID
- enabled: true
- points: levelPoints
- description: lineMetadata[cancelledSubsID].description
- lineColor: lineMetadata[cancelledSubsID].color
- strokeWidth: lineMetadata[cancelledSubsID].strokeWidth
- min: 0
- max: d3.max(@subs[-timeframeDays..], (d) -> d.started + 2)
+ levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
- ## 7-Day Net Subs
+ graph.lines.push
+ lineID: averageNewID
+ enabled: true
+ points: levelPoints
+ description: lineMetadata[averageNewID].description
+ lineColor: lineMetadata[averageNewID].color
+ strokeWidth: lineMetadata[averageNewID].strokeWidth
+ min: 0
+ max: d3.max(@subs[-timeframeDays..], (d) -> d.started + 2)
- # Build line data
- levelPoints = []
- sevenNets = []
- for sub, i in @subs
- net = 0
- if i >= @subs.length - 30
- sevenNets.push sub.started - sub.cancelled
- else
- sevenNets.push sub.started - averageCancelled
- if sevenNets.length > 7
- sevenNets.shift()
- if sevenNets.length is 7
- net = sevenNets.reduce((a, b) -> a + b) / 7
- levelPoints.push
- x: i
- y: net
- day: sub.day
- pointID: "#{netSubsID}#{i}"
- values: []
+ else
- # Ensure points for each day
- for day, i in days
- if levelPoints.length <= i or levelPoints[i].day isnt day
- prevY = if i > 0 then levelPoints[i - 1].y else 0.0
- levelPoints.splice i, 0,
- y: prevY
- day: day
+ ## Total subs target
+
+ # Build line data
+ levelPoints = []
+ for sub, i in @subs
+ levelPoints.push
+ x: i
+ y: @targetSubCount
+ day: sub.day
+ pointID: "#{targetSubsID}#{i}"
values: []
- levelPoints[i].x = i
- levelPoints[i].pointID = "#{netSubsID}#{i}"
- levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
+ levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
- @analytics.graphs[0].lines.push
- lineID: netSubsID
- enabled: true
- points: levelPoints
- description: lineMetadata[netSubsID].description
- lineColor: lineMetadata[netSubsID].color
- strokeWidth: lineMetadata[netSubsID].strokeWidth
- min: 0
- max: d3.max(@subs[-timeframeDays..], (d) -> d.started + 2)
+ graph.lines.push
+ lineID: targetSubsID
+ enabled: true
+ points: levelPoints
+ description: lineMetadata[targetSubsID].description
+ lineColor: lineMetadata[targetSubsID].color
+ strokeWidth: lineMetadata[targetSubsID].strokeWidth
+ min: 0
+ max: Math.max(@targetSubCount, d3.max(@subs, (d) -> d.total))
+
+ ## Cancelled
+
+ # TODO: move this average cancelled stuff up the chain
+ averageCancelled = 0
+
+ # Build line data
+ levelPoints = []
+ cancelled = []
+ for sub, i in @subs[@subs.length - 30...]
+ cancelled.push sub.cancelled
+ levelPoints.push
+ x: @subs.length - 30 + i
+ y: sub.cancelled
+ day: sub.day
+ pointID: "#{cancelledSubsID}#{@subs.length - 30 + i}"
+ values: []
+ averageCancelled = cancelled.reduce((a, b) -> a + b) / cancelled.length
+ for sub, i in @subs[0...-30]
+ levelPoints.splice i, 0,
+ x: i
+ y: averageCancelled
+ day: sub.day
+ pointID: "#{cancelledSubsID}#{i}"
+ values: []
+
+ # Ensure points for each day
+ for day, i in days
+ if levelPoints.length <= i or levelPoints[i].day isnt day
+ prevY = if i > 0 then levelPoints[i - 1].y else 0.0
+ levelPoints.splice i, 0,
+ y: prevY
+ day: day
+ values: []
+ levelPoints[i].x = i
+ levelPoints[i].pointID = "#{cancelledSubsID}#{i}"
+
+ levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
+
+ graph.lines.push
+ lineID: cancelledSubsID
+ enabled: true
+ points: levelPoints
+ description: lineMetadata[cancelledSubsID].description
+ lineColor: lineMetadata[cancelledSubsID].color
+ strokeWidth: lineMetadata[cancelledSubsID].strokeWidth
+ min: 0
+ max: d3.max(@subs[-timeframeDays..], (d) -> d.started + 2)
+
+ ## 7-Day Net Subs
+
+ # Build line data
+ levelPoints = []
+ sevenNets = []
+ for sub, i in @subs
+ net = 0
+ if i >= @subs.length - 30
+ sevenNets.push sub.started - sub.cancelled
+ else
+ sevenNets.push sub.started - averageCancelled
+ if sevenNets.length > 7
+ sevenNets.shift()
+ if sevenNets.length is 7
+ net = sevenNets.reduce((a, b) -> a + b) / 7
+ levelPoints.push
+ x: i
+ y: net
+ day: sub.day
+ pointID: "#{netSubsID}#{i}"
+ values: []
+
+ # Ensure points for each day
+ for day, i in days
+ if levelPoints.length <= i or levelPoints[i].day isnt day
+ prevY = if i > 0 then levelPoints[i - 1].y else 0.0
+ levelPoints.splice i, 0,
+ y: prevY
+ day: day
+ values: []
+ levelPoints[i].x = i
+ levelPoints[i].pointID = "#{netSubsID}#{i}"
+
+ levelPoints.splice(0, levelPoints.length - timeframeDays) if levelPoints.length > timeframeDays
+
+ graph.lines.push
+ lineID: netSubsID
+ enabled: true
+ points: levelPoints
+ description: lineMetadata[netSubsID].description
+ lineColor: lineMetadata[netSubsID].color
+ strokeWidth: lineMetadata[netSubsID].strokeWidth
+ min: 0
+ max: d3.max(@subs[-timeframeDays..], (d) -> d.started + 2)
+
+ @analytics.graphs.push(graph)
updateAnalyticsGraphs: ->
# Build d3 graphs
diff --git a/app/views/clans/ClansView.coffee b/app/views/clans/ClansView.coffee
index e539144bd..126086f2c 100644
--- a/app/views/clans/ClansView.coffee
+++ b/app/views/clans/ClansView.coffee
@@ -10,7 +10,7 @@ SubscribeModal = require 'views/core/SubscribeModal'
# TODO: Invalid clan name message
# TODO: Refresh data instead of page
-module.exports = class MainAdminView extends RootView
+module.exports = class ClansView extends RootView
id: 'clans-view'
template: template
diff --git a/app/views/core/AuthModal.coffee b/app/views/core/AuthModal.coffee
index 1de0c80a7..7a5845bdf 100644
--- a/app/views/core/AuthModal.coffee
+++ b/app/views/core/AuthModal.coffee
@@ -76,8 +76,17 @@ module.exports = class AuthModal extends ModalView
@enableModalInProgress(@$el) # TODO: part of forms
loginUser userObject, null, window.nextURL
+ emailCheck: ->
+ email = $('#email', @$el).val()
+ filter = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i # https://news.ycombinator.com/item?id=5763990
+ unless filter.test(email)
+ forms.setErrorToProperty @$el, 'email', 'Please enter a valid email address', true
+ return false
+ return true
+
createAccount: ->
forms.clearFormAlerts(@$el)
+ return unless @emailCheck()
userObject = forms.formToObject @$el
delete userObject.subscribe
delete userObject.name if userObject.name is ''
diff --git a/app/views/core/NotFoundView.coffee b/app/views/core/NotFoundView.coffee
deleted file mode 100644
index dd3d88e6f..000000000
--- a/app/views/core/NotFoundView.coffee
+++ /dev/null
@@ -1,13 +0,0 @@
-RootView = require 'views/core/RootView'
-template = require 'templates/core/not-found'
-
-module.exports = class NotFoundView extends RootView
- id: 'not-found-view'
- template: template
-
- # For some reason, it wasn't really rendering the top bar or doing i18n, so I hacked around it. (#2068.)
- afterRender: ->
- unless @renderedOnce
- _.delay (=> @render?()), 1000
- @renderedOnce = true
- super()
diff --git a/app/views/courses/mock1/CourseDetailsView.coffee b/app/views/courses/mock1/CourseDetailsView.coffee
new file mode 100644
index 000000000..53d0e4633
--- /dev/null
+++ b/app/views/courses/mock1/CourseDetailsView.coffee
@@ -0,0 +1,24 @@
+app = require 'core/application'
+RootView = require 'views/core/RootView'
+template = require 'templates/courses/mock1/course-details'
+
+# TODO: show invite tab and no students tab if no students
+
+module.exports = class CourseDetailsView extends RootView
+ id: 'course-details-view'
+ template: template
+
+ constructor: (options, @courseID) ->
+ super options
+ @initData()
+
+ getRenderData: ->
+ context = super()
+ context.course = @course ? {}
+ context.instance = @instance ? {}
+ context
+
+ initData: ->
+ mockData = require 'views/courses/mock1/CoursesMockData'
+ @course = mockData.courses[@courseID]
+ @instance = mockData.instances[_.random(0, mockData.instances.length - 1)]
diff --git a/app/views/courses/mock1/CourseEnrollView.coffee b/app/views/courses/mock1/CourseEnrollView.coffee
new file mode 100644
index 000000000..23d2d79b4
--- /dev/null
+++ b/app/views/courses/mock1/CourseEnrollView.coffee
@@ -0,0 +1,69 @@
+app = require 'core/application'
+RootView = require 'views/core/RootView'
+template = require 'templates/courses/mock1/course-enroll'
+
+module.exports = class CourseEnrollView extends RootView
+ id: 'course-enroll-view'
+ template: template
+
+ events:
+ 'click .btn-buy': 'onClickBuy'
+ 'change .course-select': 'onChangeCourse'
+ 'change input:radio': 'onQuantityChange'
+
+ constructor: (options, @courseID) ->
+ super options
+ @initData()
+
+ getRenderData: ->
+ context = super()
+ context.courses = @courses ? {}
+ context.courseID = @courseID
+ context.price = @price ? 0
+ context.quantity = @quantity
+ context.selectedCourseTitle = @selectedCourseTitle
+ context
+
+ afterRender: ->
+ super()
+ @$el.find('.course-select').val(@selectedCourseTitle)
+
+ initData: ->
+ mockData = require 'views/courses/mock1/CoursesMockData'
+ @courses = mockData.courses
+ @selectedCourseTitle = @courses[@courseID]?.title
+ @quantity = 20
+ @updatePrice()
+
+ onClickBuy: (e) ->
+ if @selectedCourseTitle is 'All Courses'
+ app.router.navigate "/courses/mock1/0"
+ else
+ for course, i in @courses when course.title is @selectedCourseTitle
+ app.router.navigate "/courses/mock1/#{i}"
+ break
+ window.location.reload()
+
+ onChangeCourse: (e) ->
+ @selectedCourseTitle = $(e.target).val()
+ @updatePrice()
+ @render?()
+
+ onQuantityChange: (e) ->
+ @quantity = $(e.target).data('quantity')
+ @updatePrice()
+ @$el.find('.btn-buy').text("Buy #{@selectedCourseTitle} for $#{@price}")
+
+ updatePrice: ->
+ if @selectedCourseTitle is 'All Courses'
+ @price = switch
+ when @quantity is 20 then 499
+ when @quantity is 50 then 999
+ when @quantity is 100 then 1499
+ else 2999
+ else
+ @price = switch
+ when @quantity is 20 then 99
+ when @quantity is 50 then 199
+ when @quantity is 100 then 349
+ else 799
diff --git a/app/views/courses/mock1/CourseInfoView.coffee b/app/views/courses/mock1/CourseInfoView.coffee
new file mode 100644
index 000000000..e047c0883
--- /dev/null
+++ b/app/views/courses/mock1/CourseInfoView.coffee
@@ -0,0 +1,31 @@
+app = require 'core/application'
+RootView = require 'views/core/RootView'
+template = require 'templates/courses/mock1/course-info'
+
+module.exports = class CourseInfoView extends RootView
+ id: 'course-info-view'
+ template: template
+
+ events:
+ 'click .btn-enroll': 'onClickEnroll'
+
+ constructor: (options, @courseID) ->
+ super options
+ @initData()
+
+ getRenderData: ->
+ context = super()
+ context.course = @course ? {}
+ context.courseID = @courseID
+ context.praise = @praise
+ context
+
+ initData: ->
+ mockData = require 'views/courses/mock1/CoursesMockData'
+ @course = mockData.courses[@courseID]
+ @praise = mockData.praise[_.random(0, mockData.praise.length - 1)]
+
+ onClickEnroll: (e) ->
+ courseID = $(e.target).data('course-id')
+ app.router.navigate "/courses/mock1/#{courseID}/enroll"
+ window.location.reload()
diff --git a/app/views/courses/mock1/CoursesMockData.coffee b/app/views/courses/mock1/CoursesMockData.coffee
new file mode 100644
index 000000000..de41d5e96
--- /dev/null
+++ b/app/views/courses/mock1/CoursesMockData.coffee
@@ -0,0 +1,135 @@
+data = {}
+
+data.courses = [
+ {
+ title: 'Introduction to Computer Science'
+ description: 'Learn basic syntax, method calls, and the CodeCombat learning environment.'
+ topics: ['Basic syntax', 'Method calls', 'String constants', 'while loops', 'Game mechanic: movement', 'Game mechanic: combat']
+ duration: '1 hour of material'
+ levels: ['Dungeons of Kithgard', 'Gems in the Deep', 'Shadow Guard', 'Kounter Kithwise', 'Crawlways of Kithgard', 'Enemy Mine', 'Illusory Interruption', 'Forgetful Gemsmith', 'Signs and Portents', 'Favorable Odds', 'True Names', 'The Prisoner', 'Banefire', 'The Raised Sword', 'Haunted Kithmaze', 'Riddling Kithmaze', 'Descending Further', 'The Second Kithmaze', 'Dread Door', 'Cupboards of Kithgard', 'Hack and Dash']
+ },
+ {
+ title: 'Computer Science 102'
+ description: 'Add parameters, if statements, and some other stuff.'
+ topics: ['Parameters', 'Variables', 'Booleans', 'if statement', 'Arithmetic', 'Game mechanic: building']
+ duration: '5 hours of material'
+ levels: ['Known Enemy', 'Master of Names', 'Lowly Kithmen', 'Closing the Distance', 'Tactical Strike', 'The Final Kithmaze', 'The Gauntlet', 'Radiant Aura', 'Kithgard Gates', 'Destroying Angel', 'Deadly Dungeon Rescue', 'Kithgard Brawl', 'Cavern Survival', 'Breakout', 'Attack Wisely!', 'Kithgard Mastery', 'Kithgard Apprentice', 'Long Kithmaze', 'Boom! and Bust', 'Defense of Plainswood', 'Winding Trail', 'Thumb Biter', 'Gems or Death', 'Backwoods Ambush', 'Patrol Buster', 'Endangered Burl', 'Village Guard', 'Thornbush Farm', 'Back to Back', 'Ogre Encampment', 'Woodland Cleaver', 'Shield Rush', 'Peasant Protection', 'Munchkin Swarm']
+ },
+ {
+ title: 'Computer Science 103'
+ description: 'Learn how to handle input.'
+ topics: ['Handling input', 'Game mechanic: gathering']
+ duration: '5 hours of material'
+ levels: ['Munchkin Harvest', 'Swift Dagger', 'Shrapnel', 'Arcane Ally', 'Touch of Death', 'Bonemender', 'Coinucopia', 'Copper Meadows', 'Drop the Flag', 'Deadly Pursuit', 'Rich Forager', 'Siege of Stonehold', 'Multiplayer Treasure Grove', 'Dueling Grounds', 'Backwoods Brawl', 'Backwoods Treasure', 'Range Finder', 'Stillness in Motion', 'The Agrippa Defense', 'Storming the Towers of Areth', 'Hold the Forest Pass', 'Hold for Reinforcements', 'Storming the Farmhouse', 'Wild Horses', 'Boulder Woods', 'Unfair Support', 'Tactical Timing', 'Apocalypse', 'Doom Glade', 'Defend the Garrison', 'Lost Viking', 'Forest Flower Grove', 'The Dunes', 'The Mighty Sand Yak', 'Oasis', 'Sarven Road', 'Sarven Gaps', 'Thunderhooves', 'Medical Attention', 'The Great Yak Stampede', 'Minesweeper', 'Sarven Sentry', 'Keeping Time']
+ },
+ {
+ title: 'Computer Science 104'
+ description: 'Time to tackle arrays and some pvp stuff.'
+ topics: ['Arrays', 'break statement', 'Game mechanic: multiplayer']
+ duration: '5 hours of material'
+ levels: ['Hoarding Gold', 'Decoy Drill', 'Yakstraction', 'Sarven Brawl', 'Desert Combat', 'Dust', 'Sarven Rescue', 'Sacred Statue', 'Mirage Maker', 'Sarven Savior', 'Odd Sandstorm', 'Lurkers', 'Preferential Treatment', 'Sarven Shepherd', 'Shine Getter', 'The Trials', 'Mad Maxer', 'Mad Maxer Strikes Back', 'Mad Maxer Sells Out', 'Mad Maxer Gets Greedy', 'Mad Maxer: Redemption', 'Sarven Treasure', 'Harrowland', 'Sarven Siege', 'Clash of Clones', 'Sand Snakes', 'Crag Tag']
+ },
+ {
+ title: 'Computer Science 105'
+ description: 'Time to tackle arrays and some PVP.'
+ topics: ['Object literals', 'Practice levels']
+ duration: '5 hours of material'
+ levels: ['Slalom', 'Black Diamond', 'Treasure Cave', 'Ogre Gorge Gouger', 'Dance-Off', 'Alpine Rally', 'Cloudrip Commander', 'Mountain Mercenaries']
+ },
+ {
+ title: 'Computer Science 106'
+ description: 'For loops!'
+ topics: ['for loops', 'Practice levels']
+ duration: '5 hours of material'
+ levels: ['Timber Guard', 'Hunting Party', 'Zoo Keeper', 'Cloudrip Brawl', 'Cloudrip Treasure', 'Cloudrip Siege', 'Noble Sacrifice', 'Zero Sum', 'Borrowed Sword', 'Protect and Serve']
+ },
+ {
+ title: 'Computer Science 107'
+ description: 'Functions!'
+ topics: ['Functions', 'Practice levels']
+ duration: '5 hours of material'
+ levels: ['Vital Powers', 'Timber Turncoat', 'Restless Dead', 'Ring Bearer', 'The Two Flowers', 'The Geometry of Flowers', 'Mountain Flower Grove', 'Hunters and Prey', 'Library Tactician']
+ },
+ {
+ title: 'Computer Science 108'
+ description: 'Maths.'
+ topics: ['Modulo', 'Math operations', 'Practice levels']
+ duration: '5 hours of material'
+ levels: ['Steelclaw Gap', 'Pesky Yaks', 'Mixed Unit Tactics', 'Sowing Fire', 'Reaping Fire', 'Toil and Trouble', 'What in Carnation', 'Misty Island Mine', 'Raiders of the Long Dark', 'Grim Determination', 'Deadly Discs', "Summit's Gate"]
+ },
+ {
+ title: 'Computer Science 109'
+ description: 'Vectors and strings.'
+ topics: ['Vectors', 'String manipulation', 'Practice levels']
+ duration: '5 hours of material'
+ levels: ['Circle Walking', 'Skating Away', 'Kelvintaph Crusader', 'Kelvintaph Burgler', 'Ice Soccer', 'Razorfray']
+ }
+]
+
+getStudents = ->
+ students = ['Jill', 'Billy', 'Sarah', 'Tom', 'June', 'Bob', 'Kristin', 'Samantha', 'Eric']
+ _.shuffle(students).slice(_.random(0, 5))
+
+data.instances = [
+ {
+ name: "Mr. Smith's First Period"
+ code: 'b2KF7'
+ students: getStudents()
+ },
+ {
+ name: "Mr. Smith's Second Period"
+ code: 'b2KF7'
+ students: getStudents()
+ },
+ {
+ name: "Mrs. Anderson's Third Period"
+ code: 'b2KF7'
+ students: getStudents()
+ },
+ {
+ name: "Maple High 4th"
+ code: 'b2KF7'
+ students: getStudents()
+ },
+ {
+ name: "Test class name one"
+ code: 'b2KF7'
+ students: getStudents()
+ }
+]
+
+data.praise = [
+ {
+ quote: "The kids love it."
+ source: "Leo Joseph Tran, Athlos Leadership Academy"
+ },
+ {
+ quote: "My students have been using the site for a couple of weeks and they love it."
+ source: "Scott Hatfield, Computer Applications Teacher, School Technology Coordinator, Eastside Middle School"
+ },
+ {
+ quote: "Thanks for the captivating site. My eighth graders love it."
+ source: "Janet Cook, Ansbach Middle/High School"
+ },
+ {
+ quote: "My students have started working on CodeCombat and love it! I love that they are learning coding and problem solving skills without them even knowing it!!"
+ source: "Kristin Huff, Special Education Teacher, Webb City School District"
+ },
+ {
+ quote: "I recently introduced Code Combat to a few of my fifth graders and they are loving it!"
+ source: "Shauna Hamman, Fifth Grade Teacher, Four Peaks Elementary School"
+ },
+ {
+ quote: "Overall I think it's a fantastic service. Variables, arrays, loops, all covered in very fun and imaginative ways. Every kid who has tried it is a fan."
+ source: "Aibinder Andrew, Technology Teacher"
+ },
+ {
+ quote: "I love what you have created. The kids are so engaged."
+ source: "Desmond Smith, 4KS Academy"
+ },
+ {
+ quote: "My students love the website and I hope on having content structured around it in the near future."
+ source: "Michael Leonard, Science Teacher, Clearwater Central Catholic High School"
+ }
+]
+module.exports = data
diff --git a/app/views/courses/mock1/CoursesView.coffee b/app/views/courses/mock1/CoursesView.coffee
new file mode 100644
index 000000000..e017ed965
--- /dev/null
+++ b/app/views/courses/mock1/CoursesView.coffee
@@ -0,0 +1,50 @@
+app = require 'core/application'
+RootView = require 'views/core/RootView'
+template = require 'templates/courses/mock1/courses'
+
+module.exports = class CoursesView extends RootView
+ id: 'courses-view'
+ template: template
+
+ events:
+ 'click .btn-enter': 'onClickEnter'
+ 'click .btn-have-code': 'onClickHaveCode'
+ 'click .btn-more-info': 'onClickMoreInfo'
+
+ constructor: (options) ->
+ super options
+ @initData()
+
+ getRenderData: ->
+ context = super()
+ context.courses = @courses ? []
+ context
+
+ initData: ->
+ mockData = require 'views/courses/mock1/CoursesMockData'
+ @courses = mockData.courses
+ for course, i in @courses
+ if i is 0 or _.random(0, 2) is 0
+ course.unlocked = true
+ else
+ break
+
+ onClickEnter: (e) ->
+ courseID = $(e.target).data('course-id')
+ app.router.navigate "/courses/mock1/#{courseID}"
+ window.location.reload()
+
+ onClickHaveCode: (e) ->
+ courseID = $(e.target).data('course-id')
+ alert 'TODO: Popup for entering prepaid code to unlock this course'
+
+ # TODO: would just navigate instead of rendering unlock here in practice
+ @courses[courseID].unlocked = true
+ @render?()
+ # app.router.navigate "/courses/mock1/#{courseID}"
+ # window.location.reload()
+
+ onClickMoreInfo: (e) ->
+ courseID = $(e.target).data('course-id')
+ app.router.navigate "/courses/mock1/#{courseID}/info"
+ window.location.reload()
diff --git a/app/views/editor/level/settings/SettingsTabView.coffee b/app/views/editor/level/settings/SettingsTabView.coffee
index 5c7181824..f3a42a20d 100644
--- a/app/views/editor/level/settings/SettingsTabView.coffee
+++ b/app/views/editor/level/settings/SettingsTabView.coffee
@@ -15,7 +15,7 @@ module.exports = class SettingsTabView extends CocoView
editableSettings: [
'name', 'description', 'documentation', 'nextLevel', 'background', 'victory', 'i18n', 'icon', 'goals',
'type', 'terrain', 'showsGuide', 'banner', 'employerDescription', 'loadingTip', 'requiresSubscription',
- 'tasks', 'helpVideos', 'replayable', 'scoreTypes'
+ 'tasks', 'helpVideos', 'replayable', 'scoreTypes', 'concepts'
]
subscriptions:
diff --git a/app/views/editor/modal/NewModelModal.coffee b/app/views/editor/modal/NewModelModal.coffee
index e0c98517b..7debf7e00 100644
--- a/app/views/editor/modal/NewModelModal.coffee
+++ b/app/views/editor/modal/NewModelModal.coffee
@@ -15,13 +15,14 @@ module.exports = class NewModelModal extends ModalView
super options
@modelClass = options.model
@modelLabel = options.modelLabel
+ @newModelTitle = "editor.new_#{_.string.slugify @modelLabel}_title"
@properties = options.properties
$('#name').ready @focusOnName
getRenderData: ->
c = super()
c.modelLabel = @modelLabel
- #c.newModelTitle = @newModelTitle
+ c.newModelTitle = @newModelTitle
c
makeNewModel: ->
diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee
index cb4a13db5..28f40991c 100644
--- a/app/views/play/level/tome/SpellView.coffee
+++ b/app/views/play/level/tome/SpellView.coffee
@@ -432,7 +432,7 @@ module.exports = class SpellView extends CocoView
else content
entry =
content: content
- meta: 'press enter'
+ meta: $.i18n.t('keyboard_shortcuts.press_enter', defaultValue: 'press enter')
name: doc.name
tabTrigger: doc.snippets[e.language].tab
haveFindNearestEnemy ||= doc.name is 'findNearestEnemy'
diff --git a/app/views/play/menu/InventoryModal.coffee b/app/views/play/menu/InventoryModal.coffee
index 324412723..0f6b358d0 100644
--- a/app/views/play/menu/InventoryModal.coffee
+++ b/app/views/play/menu/InventoryModal.coffee
@@ -18,6 +18,7 @@ module.exports = class InventoryModal extends ModalView
className: 'modal fade play-modal'
template: template
slots: ['head', 'eyes', 'neck', 'torso', 'wrists', 'gloves', 'left-ring', 'right-ring', 'right-hand', 'left-hand', 'waist', 'feet', 'programming-book', 'pet', 'minion', 'flag'] #, 'misc-0', 'misc-1'] # TODO: bring in misc slot(s) again when we have space
+ ringSlots: ['left-ring', 'right-ring']
closesOnClickOutside: false # because draggable somehow triggers hide when you don't drag onto a draggable
events:
@@ -104,7 +105,7 @@ module.exports = class InventoryModal extends ModalView
unless gearSlugs[item.get('original')] is 'tarnished-bronze-breastplate' and inCampaignView and @options.level.get('slug') is 'the-raised-sword'
for slot in item.getAllowedSlots()
continue unless requiredItems = requiredGear[slot]
- continue if @equipment[slot] and @equipment[slot] not in allRestrictedGear
+ continue if @equipment[slot] and @equipment[slot] not in allRestrictedGear and slot not in @ringSlots
# Point out that they must buy it if they haven't bought any of the required items for that slot, and it's the first one.
if item.get('original') is requiredItems[0] and not _.find(requiredItems, (requiredItem) -> me.ownsItem requiredItem)
requiredToPurchase = true
@@ -430,10 +431,21 @@ module.exports = class InventoryModal extends ModalView
updateLevelRequiredItems: (equipment) ->
return unless requiredGear = @options.level.get 'requiredGear'
return unless heroClass = @selectedHero?.get 'heroClass'
+
for slot, items of requiredGear when items.length
- equipped = equipment[slot]
- continue if equipped in items
- continue if equipped # Actually, just let them play if they have equipped anything in that slot (and we haven't unequipped it due to restrictions).
+ if slot in @ringSlots
+ validSlots = @ringSlots
+ else
+ validSlots = [slot]
+
+ continue if validSlots.some (slot) ->
+ equipped = equipment[slot]
+ equipped in items
+
+ # Actually, just let them play if they have equipped anything in that slot (and we haven't unequipped it due to restrictions).
+ # Rings often have unique effects, so this rule does not apply to them (they are still required even if there is a non-restricted ring equipped in the slot).
+ continue if equipment[slot] and slot not in @ringSlots
+
items = (item for item in items when heroClass in (@items.findWhere(original: item)?.classes ? []))
continue unless items.length # If the required items are for another class, then let's not be finicky.
diff --git a/bower.json b/bower.json
index 484277bcb..30991c9ea 100644
--- a/bower.json
+++ b/bower.json
@@ -47,7 +47,7 @@
"modernizr": "~2.8.3",
"backfire": "~0.3.0",
"fastclick": "~1.0.3",
- "three.js": "*",
+ "three.js": "~0.71.0",
"lscache": "~1.0.5"
},
"overrides": {
diff --git a/server/levels/level_handler.coffee b/server/levels/level_handler.coffee
index b112cce8c..26ea7ac26 100644
--- a/server/levels/level_handler.coffee
+++ b/server/levels/level_handler.coffee
@@ -60,6 +60,7 @@ LevelHandler = class LevelHandler extends Handler
'replayable'
'buildTime'
'scoreTypes'
+ 'concepts'
]
postEditableProperties: ['name']
diff --git a/server/routes/mail.coffee b/server/routes/mail.coffee
index 89aac7bb9..9bc94967e 100644
--- a/server/routes/mail.coffee
+++ b/server/routes/mail.coffee
@@ -730,7 +730,7 @@ sendNextStepsEmail = (user, now, daysAgo) ->
#'mv-code-club': isKid # TODO: geodetect, get landing page URL
'breakout-mentors': isKid
nAdditionalOffers = Math.max 0, 4 - _.filter(offers).length
- possibleAdditionalOffers = ['ostraining', 'code-school', 'one-month', 'learnable', 'pluralsight']
+ possibleAdditionalOffers = ['ostraining', 'code-school', 'one-month', 'pluralsight']
for offer in _.sample possibleAdditionalOffers, nAdditionalOffers
offers[offer] = true
if user.isPremium()
diff --git a/vendor/scripts/ShaderParticles.js b/vendor/scripts/ShaderParticles.js
index 0897535f3..c3f49f8d4 100644
--- a/vendor/scripts/ShaderParticles.js
+++ b/vendor/scripts/ShaderParticles.js
@@ -1,4 +1,4 @@
-// ShaderParticleUtils 0.7.8
+// ShaderParticleUtils 0.7.9
//
// (c) 2014 Luke Moody (http://www.github.com/squarefeet)
// & Lee Stemkoski (http://www.adelphi.edu/~stemkoski/)
@@ -300,7 +300,7 @@ SPE.utils = {
}
};;
-// ShaderParticleGroup 0.7.8
+// ShaderParticleGroup 0.7.9
//
// (c) 2014 Luke Moody (http://www.github.com/squarefeet)
// & Lee Stemkoski (http://www.adelphi.edu/~stemkoski/)
@@ -325,10 +325,10 @@ SPE.Group = function( options ) {
// Material properties
that.blending = typeof options.blending === 'number' ? options.blending : THREE.AdditiveBlending;
- that.transparent = typeof options.transparent === 'number' ? options.transparent : 1;
+ that.transparent = typeof options.transparent === 'boolean' ? options.transparent : true;
that.alphaTest = typeof options.alphaTest === 'number' ? options.alphaTest : 0.5;
- that.depthWrite = options.depthWrite || false;
- that.depthTest = options.depthTest || true;
+ that.depthWrite = typeof options.depthWrite === 'boolean' ? options.depthWrite : false;
+ that.depthTest = typeof options.depthTest === 'boolean' ? options.depthTest : true;
// Create uniforms
that.uniforms = {
@@ -845,7 +845,7 @@ SPE.shaders = {
};
;
-// ShaderParticleEmitter 0.7.8
+// ShaderParticleEmitter 0.7.9
//
// (c) 2014 Luke Moody (http://www.github.com/squarefeet)
// & Lee Stemkoski (http://www.adelphi.edu/~stemkoski/)
@@ -957,6 +957,10 @@ SPE.Emitter = function( options ) {
that.alive = parseFloat( typeof options.alive === 'number' ? options.alive : 1.0 );
that.isStatic = typeof options.isStatic === 'number' ? options.isStatic : 0;
+ // Particle spawn callback function.
+ that.onParticleSpawn = typeof options.onParticleSpawn === 'function' ? options.onParticleSpawn : null;
+
+
// The following properties are used internally, and mostly set when this emitter
// is added to a particle group.
that.particlesPerSecond = 0;
@@ -1023,6 +1027,10 @@ SPE.Emitter.prototype = {
that._randomizeExistingVector3OnDisk( particlePosition, that.position, that.radius, that.radiusSpread, that.radiusScale, that.radiusSpreadClamp );
that._randomizeExistingVelocityVector3OnSphere( particleVelocity, that.position, particlePosition, that.speed, that.speedSpread );
}
+
+ if( typeof that.onParticleSpawn === 'function' ) {
+ that.onParticleSpawn( a, i );
+ }
},
/**