Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-06-21 09:18:01 -07:00
commit 05f54a26f0
2 changed files with 107 additions and 107 deletions

View file

@ -141,7 +141,7 @@ module.exports = class Simulator extends CocoClass
console.log info
@trigger 'statusUpdate', info
@fetchAndSimulateOneGame()
application.tracker?.trackEvent 'Simulator Result', label: "No Games"
application.tracker?.trackEvent 'Simulator Result', label: "No Games", ['Google Analytics']
simulateAnotherTaskAfterDelay: =>
console.log "Retrying in #{@retryDelayInSeconds}"
@ -264,7 +264,7 @@ module.exports = class Simulator extends CocoClass
unless @options.headlessClient
simulatedBy = parseInt($('#simulated-by-you').text(), 10) + 1
$('#simulated-by-you').text(simulatedBy)
application.tracker?.trackEvent 'Simulator Result', label: "Success"
application.tracker?.trackEvent 'Simulator Result', label: "Success", ['Google Analytics']
handleTaskResultsTransferError: (error) =>
return if @destroyed

View file

@ -5,12 +5,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
sending: "Αποστολή ..."
# send: "Send"
cancel: "Ακύρωση"
# save: "Save"
# publish: "Publish"
# create: "Create"
# delay_1_sec: "1 second"
# delay_3_sec: "3 seconds"
# delay_5_sec: "5 seconds"
save: "Αποθήκευση"
publish: "Δημοσιοποίηση"
create: "Δημιουργία"
delay_1_sec: "1 δευτερόλεπτο"
delay_3_sec: "3 δευτερόλεπτα"
delay_5_sec: "5 δευτερόλεπτα"
# manual: "Manual"
# fork: "Fork"
# play: "Play"
@ -19,21 +19,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# unwatch: "Unwatch"
# submit_patch: "Submit Patch"
# units:
# second: "second"
# seconds: "seconds"
# minute: "minute"
# minutes: "minutes"
# hour: "hour"
# hours: "hours"
# day: "day"
# days: "days"
# week: "week"
# weeks: "weeks"
# month: "month"
# months: "months"
# year: "year"
# years: "years"
units:
second: "δευτερόλεπτο"
seconds: "δευτερόλεπτα"
minute: "λεπτό"
minutes: "λεπτά"
hour: "ώρα"
hours: "ώρες"
day: "μέρα"
days: "μέρες"
week: "εβδομάδα"
weeks: "εβδομάδες"
month: "μήνας"
months: "μήνες"
year: "χρόνος"
years: "χρόνια"
modal:
close: "Κλείσε"
@ -43,12 +43,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
page_not_found: "Η σελίδα δεν βρέθηκε"
nav:
# play: "Levels"
# play: "Επίπεδα"
# community: "Community"
# editor: "Editor"
blog: "Μπλόγκ"
forum: "Φόρουμ"
# account: "Account"
account: "Λογαριασμός"
admin: "Διαχειριστής"
home: "Αρχική"
contribute: "Συμβάλλω"
@ -59,12 +59,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# employers: "Employers"
# versions:
# save_version_title: "Save New Version"
save_version_title: "Αποθήκευση νέας έκδοσης"
# new_major_version: "New Major Version"
# cla_prefix: "To save changes, first you must agree to our"
cla_prefix: "Για να αποθηκεύσετε, πρώτα πρέπει να συμφωνήσετε στα"
# cla_url: "CLA"
# cla_suffix: "."
# cla_agree: "I AGREE"
cla_agree: "ΣΥΜΦΩΝΩ"
login:
sign_up: "Δημιούργησε Λογαριασμό"
@ -75,18 +75,18 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
recover:
recover_account_title: "Κάντε ανάκτηση του λογαριασμού σας"
# send_password: "Send Recovery Password"
send_password: "Αποστολή κωδικού ανάκτησης"
signup:
# create_account_title: "Create Account to Save Progress"
create_account_title: "Δημιουργία λογαριασμού για αποθήκευση της προόδου"
description: "Είναι δωρεάν. Απλώς χρειάζεται να έχεις έναν λογαριασμό και θα είσαι έτοιμος να παίξεις:"
email_announcements: "Λαμβάνετε ανακοινώσεις μέσω e-mail"
coppa: "13+ ή Εκτός Αμερικής "
coppa_why: "(Γιάτι?)"
coppa_why: "(Γιατί;)"
creating: "Δημιουργία λογαριασμού"
sign_up: "Εγγραγή"
log_in: "Σύνδεση με κώδικο"
# social_signup: "Or, you can sign up through Facebook or G+:"
sign_up: "Εγγραφή"
log_in: "Σύνδεση με κωδικό"
social_signup: "Ή, μπορείς να συνδεθείς μέσω του Facebook ή του G+:"
# required: "You need to log in before you can go that way."
home:
@ -94,12 +94,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
no_ie: "Το CodeCombat δεν παίζει με το Internet Explorer 9 ή κάποια παλαιότερη έκδοση. Συγνώμη!"
no_mobile: "Το CodeCombat δεν σχεδιάστηκε για κινητά και μπορεί να μην δουλεύει!"
play: "Παίξε"
# old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
# old_browser_suffix: "You can try anyway, but it probably won't work."
# campaign: "Campaign"
# for_beginners: "For Beginners"
old_browser: "Ωχ, ο περιηγητής σας είναι πολύ παλιός για να τρέξετε το CodeCombat. Συγνώμη!"
old_browser_suffix: "Μπορείτε να δοκιμάσετε, αλλά πιθανών να μην λειτουργήσει."
campaign: "Εκστρατεία"
for_beginners: "Για αρχάριους"
# multiplayer: "Multiplayer"
# for_developers: "For Developers"
for_developers: "Για προγραμματιστές"
play:
choose_your_level: "Διάλεξε την πίστα σου"
@ -139,21 +139,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
learn_more: "Μάθετε περισσότερα σχετικά με το να είστε ένας Διπλωμάτης"
subscribe_as_diplomat: "Εγγραφή ως Διπλωμάτης"
# wizard_settings:
# title: "Wizard Settings"
# customize_avatar: "Customize Your Avatar"
# active: "Active"
# color: "Color"
# group: "Group"
# clothes: "Clothes"
wizard_settings:
title: "Ρυθμίσεις Μάγου"
customize_avatar: "Διαμόρφωσε το Avatar σου"
active: "Ενεργό"
color: "Χρώμα"
group: "Ομάδα"
clothes: "Ρούχα"
# trim: "Trim"
# cloud: "Cloud"
# team: "Team"
# spell: "Spell"
# boots: "Boots"
# hue: "Hue"
# saturation: "Saturation"
# lightness: "Lightness"
cloud: "Σύννεφο"
# team: "Ομάδα"
spell: "Ξόρκι"
boots: "Μπότες"
hue: "Απόχρωση"
saturation: "Κορεσμός"
lightness: "Φωτεινότητα"
account_settings:
title: "Ρυθμίσεις λογαριασμού"
@ -161,7 +161,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
autosave: "Οι ρυθμίσεις αποθηκεύονται αυτόματα"
me_tab: "Εγώ"
picture_tab: "Φωτογραφία"
# upload_picture: "Upload a picture"
upload_picture: "Ανέβασμα φωτογραφίας"
wizard_tab: "Μάγος"
password_tab: "Κωδικός"
emails_tab: "Emails"
@ -172,7 +172,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
email_subscriptions: "Συνδρομές Email"
email_announcements: "Ανακοινώσεις"
email_announcements_description: "Λάβετε emails για τα τελευταία νέα και τις εξελίξεις του CodeCombat."
# email_notifications: "Notifications"
email_notifications: "Ειδοποιήσεις"
# email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
# email_any_notes: "Any Notifications"
# email_any_notes_description: "Disable to stop all activity notification emails."
@ -193,25 +193,25 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# view_profile: "View Your Profile"
account_profile:
# settings: "Settings"
# edit_profile: "Edit Profile"
# done_editing: "Done Editing"
settings: "Ρυθμίσεις"
edit_profile: "Επεξεργασία προφίλ"
done_editing: "Τέλος επεξεργασίας"
profile_for_prefix: "Προφίλ για "
# profile_for_suffix: ""
# featured: "Featured"
# not_featured: "Not Featured"
# looking_for: "Looking for:"
# last_updated: "Last updated:"
# contact: "Contact"
looking_for: "Αναζήτηση για:"
last_updated: "Τελευταία ενημερώθηκε:"
contact: "Επικοινωνία"
# active: "Looking for interview offers now"
# inactive: "Not looking for offers right now"
# complete: "complete"
# next: "Next"
# next_city: "city?"
# next_country: "pick your country."
# next_name: "name?"
# next_short_description: "write a short description."
# next_long_description: "describe your desired position."
complete: "Ολοκληρωμένο"
next: "Επόμενο"
next_city: "πόλη;"
next_country: "επέλεξε τη χώρα σου."
next_name: "όνομα;"
next_short_description: "γράψε μία μικρή περιγραφή."
next_long_description: "περιέγραψε την επιθυμητή σου θέση."
# next_skills: "list at least five skills."
# next_work: "chronicle your work history."
# next_education: "recount your educational ordeals."
@ -529,35 +529,35 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# edit_btn_preview: "Preview"
# edit_article_title: "Edit Article"
# general:
# and: "and"
# name: "Name"
general:
and: "και"
name: "Όνομα"
# body: "Body"
# version: "Version"
version: "Έκδοση"
# commit_msg: "Commit Message"
# version_history: "Version History"
# version_history_for: "Version History for: "
# result: "Result"
# results: "Results"
# description: "Description"
# or: "or"
# subject: "Subject"
# email: "Email"
# password: "Password"
# message: "Message"
result: "Αποτέλεσμα"
results: "Αποτελέσματα"
description: "Περιγραφή"
or: "ή"
subject: "Θέμα"
email: "Email"
password: "Κωδικός"
message: "Μήνυμα"
# code: "Code"
# ladder: "Ladder"
# when: "When"
# opponent: "Opponent"
# rank: "Rank"
# score: "Score"
# win: "Win"
# loss: "Loss"
# tie: "Tie"
# easy: "Easy"
# medium: "Medium"
# hard: "Hard"
# player: "Player"
when: "Όταν"
opponent: "Αντίπαλος"
rank: "Κατηγορία"
score: "Αποτέλεσμα"
win: "Νίκη"
loss: "Ήττα"
tie: "Ισοπαλία"
easy: "Εύκολο"
medium: "Μέτριο"
hard: "Δύσκολο"
player: "Παίκτης"
# about:
# who_is_codecombat: "Who is CodeCombat?"
@ -735,21 +735,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# translating_diplomats: "Our Translating Diplomats:"
# helpful_ambassadors: "Our Helpful Ambassadors:"
# classes:
# archmage_title: "Archmage"
# archmage_title_description: "(Coder)"
# artisan_title: "Artisan"
# artisan_title_description: "(Level Builder)"
# adventurer_title: "Adventurer"
# adventurer_title_description: "(Level Playtester)"
# scribe_title: "Scribe"
# scribe_title_description: "(Article Editor)"
# diplomat_title: "Diplomat"
# diplomat_title_description: "(Translator)"
# ambassador_title: "Ambassador"
# ambassador_title_description: "(Support)"
# counselor_title: "Counselor"
# counselor_title_description: "(Expert/Teacher)"
classes:
archmage_title: "Αρχιμάγος"
archmage_title_description: "(Προγραμματιστής)"
artisan_title: "Τεχνίτης"
artisan_title_description: "(Δημιουργός επιπέδων)"
adventurer_title: "Εξερευνητής"
adventurer_title_description: "(Δοκιματής επιπέδων)"
scribe_title: "Γραφέας"
scribe_title_description: "(Συντάκτης άρθρων)"
diplomat_title: "Διπλωμάτης"
diplomat_title_description: "(Μεταφραστής)"
ambassador_title: "Πρεσβευτής"
ambassador_title_description: "(Υποστήριξη)"
counselor_title: "Σύμβουλος"
counselor_title_description: "(Ειδικός/Δάσκαλος)"
# ladder:
# please_login: "Please log in first before playing a ladder game."