codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-25 16:47:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-12-08 11:18:06 -08:00
commit 0e660e29e9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/locale/en-GB.coffee
View file

@ -132,8 +132,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# misc: "Misc" # misc: "Misc"
# books: "Books" # books: "Books"
common: # common:
loading: "Loading..." # loading: "Loading..."
# saving: "Saving..." # saving: "Saving..."
# sending: "Sending..." # sending: "Sending..."
# send: "Send" # send: "Send"
@ -197,7 +197,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# year: "year" # year: "year"
# years: "years" # years: "years"
play_level: # play_level:
# done: "Done" # done: "Done"
# home: "Home" # Not used any more, will be removed soon. # home: "Home" # Not used any more, will be removed soon.
# level: "Level" # Like "Level: Dungeons of Kithgard" # level: "Level" # Like "Level: Dungeons of Kithgard"
@ -470,7 +470,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# contact_candidate: "Contact Candidate" # Deprecated # contact_candidate: "Contact Candidate" # Deprecated
# recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated # recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 15% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns." # Deprecated
account_settings: # account_settings:
# title: "Account Settings" # title: "Account Settings"
# not_logged_in: "Log in or create an account to change your settings." # not_logged_in: "Log in or create an account to change your settings."
# autosave: "Changes Save Automatically" # autosave: "Changes Save Automatically"

2
app/locale/id.coffee
View file

@ -110,7 +110,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
# sign_in_with_gplus: "Sign in with G+" # sign_in_with_gplus: "Sign in with G+"
# signup_switch: "Want to create an account?" # signup_switch: "Want to create an account?"
signup: # signup:
# email_announcements: "Receive announcements by email" # email_announcements: "Receive announcements by email"
# creating: "Creating Account..." # creating: "Creating Account..."
# sign_up: "Sign Up" # sign_up: "Sign Up"