From 7179236caafeaaa3ba63bbcf8c9d76fdf71d8121 Mon Sep 17 00:00:00 2001 From: nixel2007 Date: Fri, 5 Dec 2014 01:00:50 +0300 Subject: [PATCH 01/32] Update ru.coffee G+ commands, skill_docs, about - team blocks, thangs and small fixes. --- app/locale/ru.coffee | 90 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index f0b55cbb6..21020971d 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -6,7 +6,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi play: "Играть" # The big play button that just starts playing a level old_browser: "Ой, ваш браузер слишком стар для запуска CodeCombat. Извините!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Вы всё равно можете попробовать, но, скорее всего, это не будет работать." -# 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: "Плохие новости: CodeCombat не запускается в браузере IPad. Хорошие новости: наше нативное приложение для IPad ожидает одобрения от Apple." campaign: "Кампания" for_beginners: "Новичкам" multiplayer: "Мультиплеер" # Not currently shown on home page @@ -98,9 +98,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi logging_in: "Вход..." log_out: "Выйти" recover: "восстановить аккаунт" -# authenticate_gplus: "Authenticate G+" -# load_profile: "Load G+ Profile" -# load_email: "Load G+ Email" + authenticate_gplus: "Войти через G+" + load_profile: "Загрузить профиль G+" + load_email: "Загрузить G+ почту" # finishing: "Finishing" signup: @@ -313,13 +313,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi choose_inventory: "Выбрать предметы" equipped_item: "Выбранный" available_item: "Доступно" -# restricted_title: "Restricted" - should_equip: "(двойной клик чтобы одеть)" + restricted_title: "Ограниченный" + should_equip: "(двойной клик чтобы надеть)" equipped: "(выбранный)" locked: "(заблокированный)" restricted: "(запрещен в этом уровне)" -# equip: "Equip" -# unequip: "Unequip" + equip: "Надеть" + unequip: "Снять" buy_gems: few_gems: "Немного самоцветов" @@ -357,26 +357,26 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi blocks: "Блокирует" # As in "this shield blocks this much damage" skills: "Умения" available_for_purchase: "Доступно для покупки" -# level_to_unlock: "Level to unlock:" + level_to_unlock: "Разблокируется на уровне:" # ToDo: check in interface restricted_to_certain_heroes: "Только определенные герои могут играть этот уровень." -# skill_docs: + 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" + action_name: "имя" # ToDo: check in interface + action_cooldown: "Применяется" + action_specific_cooldown: "Восстановление" + action_damage: "Повреждения" + action_range: "Дальность" + action_radius: "Радиус" + action_duration: "Длительность" + example: "Пример" + ex: "пр." # Abbreviation of "example" + current_value: "Текущее значение" + default_value: "Значение по умолчанию" + parameters: "Параметры" + returns: "Возвращает" + granted_by: "Предоставлено" save_load: granularity_saved_games: "Сохранено" @@ -420,17 +420,17 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi press_paragraph_1_prefix: "Хотите написать о нас? Скачивайте и используйте все ресурсы, включенный в наш" press_paragraph_1_link: "пресс-пакет" press_paragraph_1_suffix: ". Все изображения могут быть использованы без предварительного уведомления." -# team: "Team" -# george_title: "CEO" -# george_blurb: "Businesser" -# scott_title: "Programmer" -# scott_blurb: "Reasonable One" -# nick_title: "Programmer" -# nick_blurb: "Motivation Guru" -# michael_title: "Programmer" -# michael_blurb: "Sys Admin" -# matt_title: "Programmer" -# matt_blurb: "Bicyclist" + team: "Команда" + george_title: "Исполнительный директор" + george_blurb: "Деловой" + scott_title: "Программист" + scott_blurb: "Разумный" + nick_title: "Программист" + nick_blurb: "Гуру мотивации" + michael_title: "Программист" + michael_blurb: "Сисадмин" + matt_title: "Программист" + matt_blurb: "Велосипедист" versions: save_version_title: "Сохранить новую версию" @@ -794,13 +794,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi account: recently_played: "Недавно сыграно" no_recent_games: "Нет сыгранных игр за последние две недели." -# payments: "Payments" -# service_apple: "Apple" -# service_web: "Web" + payments: "Платежи" + service_apple: "Apple" + service_web: "Web" # paid_on: "Paid On" # service: "Service" -# price: "Price" -# gems: "Gems" + price: "Цена" + gems: "Самоцветы" loading_error: could_not_load: "Ошибка загрузки с сервера" @@ -835,20 +835,20 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi systems: "Системы" component: "Компонент" components: "Компоненты" -# thang: "Thang" -# thangs: "Thangs" + thang: "Предмет" + thangs: "Предметы" level_session: "Ваша сессия" opponent_session: "Сессия противника" article: "Статья" user_names: "Никнеймы" -# thang_names: "Thang Names" + thang_names: "Имена предмета" files: "Файлы" # top_simulators: "Top Simulators" source_document: "Исходный документ" document: "Документ" # sprite_sheet: "Sprite Sheet" -# employers: "Employers" -# candidates: "Candidates" + employers: "Работники" + candidates: "Кандидаты" # candidate_sessions: "Candidate Sessions" user_remark: "Пользовательские поправки" user_remarks: "Пользовательские поправки" From 4ff6e95f6240411c3348fd55d02f38db28f966f4 Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Thu, 4 Dec 2014 14:23:43 -0800 Subject: [PATCH 02/32] Add show subscribe modal events --- app/views/account/PaymentsView.coffee | 1 + app/views/play/WorldMapView.coffee | 8 +++++++- app/views/play/level/LevelLoadingView.coffee | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/views/account/PaymentsView.coffee b/app/views/account/PaymentsView.coffee index 4bf7b7a62..8ec4d888e 100644 --- a/app/views/account/PaymentsView.coffee +++ b/app/views/account/PaymentsView.coffee @@ -29,6 +29,7 @@ module.exports = class PaymentsView extends RootView onClickStartSubscription: (e) -> @openModalView new SubscribeModal() + window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'payments view' onSubscribed: -> document.location.reload() diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index a9b3305ef..7afe43cad 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -120,7 +120,11 @@ module.exports = class WorldMapView extends RootView @preloadTopHeroes() unless me.get('heroConfig')?.thangType if @requiresSubscription modal = if me.get('anonymous') then AuthModal else SubscribeModal - _.delay (=> @openModalView? new modal() unless window.currentModal), 2000 + _.delay => + @openModalView? new modal() unless window.currentModal + if modal is SubscribeModal + window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'world map loadded' + , 2000 onSubscribed: -> @requiresSubscription = false @@ -208,6 +212,8 @@ module.exports = class WorldMapView extends RootView if @requiresSubscription and not @levelStatusMap[level.id] and not level.adventurer modal = if me.get('anonymous') then AuthModal else SubscribeModal @openModalView new modal() + if modal is SubscribeModal + window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'map level clicked' else if $(e.target).attr('disabled') Backbone.Mediator.publish 'router:navigate', route: '/contribute/adventurer' return diff --git a/app/views/play/level/LevelLoadingView.coffee b/app/views/play/level/LevelLoadingView.coffee index 75db2ac45..04955721f 100644 --- a/app/views/play/level/LevelLoadingView.coffee +++ b/app/views/play/level/LevelLoadingView.coffee @@ -112,6 +112,8 @@ module.exports = class LevelLoadingView extends CocoView onClickStartSubscription: (e) -> modal = if me.get('anonymous') then AuthModal else SubscribeModal @openModalView new modal() + if modal is SubscribeModal + window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'level loading' onSubscribed: -> document.location.reload() From b253eb9be8fea5012b01ab838d36fe78803b0d54 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Thu, 4 Dec 2014 14:34:35 -0800 Subject: [PATCH 03/32] Merged something. --- app/locale/ar.coffee | 36 ++++++++++++++++++++++-------- app/locale/bg.coffee | 36 ++++++++++++++++++++++-------- app/locale/ca.coffee | 36 ++++++++++++++++++++++-------- app/locale/cs.coffee | 36 ++++++++++++++++++++++-------- app/locale/da.coffee | 36 ++++++++++++++++++++++-------- app/locale/de-AT.coffee | 36 ++++++++++++++++++++++-------- app/locale/de-CH.coffee | 36 ++++++++++++++++++++++-------- app/locale/de-DE.coffee | 36 ++++++++++++++++++++++-------- app/locale/el.coffee | 36 ++++++++++++++++++++++-------- app/locale/en-AU.coffee | 36 ++++++++++++++++++++++-------- app/locale/en-GB.coffee | 36 ++++++++++++++++++++++-------- app/locale/en-US.coffee | 36 ++++++++++++++++++++++-------- app/locale/es-419.coffee | 36 ++++++++++++++++++++++-------- app/locale/es-ES.coffee | 36 ++++++++++++++++++++++-------- app/locale/fa.coffee | 36 ++++++++++++++++++++++-------- app/locale/fi.coffee | 36 ++++++++++++++++++++++-------- app/locale/fr.coffee | 40 ++++++++++++++++++++++++--------- app/locale/gl.coffee | 36 ++++++++++++++++++++++-------- app/locale/he.coffee | 36 ++++++++++++++++++++++-------- app/locale/hi.coffee | 36 ++++++++++++++++++++++-------- app/locale/hu.coffee | 36 ++++++++++++++++++++++-------- app/locale/id.coffee | 36 ++++++++++++++++++++++-------- app/locale/it.coffee | 36 ++++++++++++++++++++++-------- app/locale/ja.coffee | 36 ++++++++++++++++++++++-------- app/locale/ko.coffee | 36 ++++++++++++++++++++++-------- app/locale/lt.coffee | 36 ++++++++++++++++++++++-------- app/locale/ms.coffee | 36 ++++++++++++++++++++++-------- app/locale/nb.coffee | 42 +++++++++++++++++++++++++---------- app/locale/nl-BE.coffee | 36 ++++++++++++++++++++++-------- app/locale/nl-NL.coffee | 36 ++++++++++++++++++++++-------- app/locale/nn.coffee | 36 ++++++++++++++++++++++-------- app/locale/no.coffee | 36 ++++++++++++++++++++++-------- app/locale/pl.coffee | 36 ++++++++++++++++++++++-------- app/locale/pt-BR.coffee | 36 ++++++++++++++++++++++-------- app/locale/pt-PT.coffee | 36 ++++++++++++++++++++++-------- app/locale/ro.coffee | 36 ++++++++++++++++++++++-------- app/locale/ru.coffee | 36 ++++++++++++++++++++++-------- app/locale/sk.coffee | 36 ++++++++++++++++++++++-------- app/locale/sl.coffee | 36 ++++++++++++++++++++++-------- app/locale/sr.coffee | 36 ++++++++++++++++++++++-------- app/locale/sv.coffee | 36 ++++++++++++++++++++++-------- app/locale/th.coffee | 36 ++++++++++++++++++++++-------- app/locale/tr.coffee | 36 ++++++++++++++++++++++-------- app/locale/uk.coffee | 37 ++++++++++++++++++++++-------- app/locale/ur.coffee | 36 ++++++++++++++++++++++-------- app/locale/vi.coffee | 36 ++++++++++++++++++++++-------- app/locale/zh-HANS.coffee | 36 ++++++++++++++++++++++-------- app/locale/zh-HANT.coffee | 36 ++++++++++++++++++++++-------- app/locale/zh-WUU-HANS.coffee | 36 ++++++++++++++++++++++-------- app/locale/zh-WUU-HANT.coffee | 36 ++++++++++++++++++++++-------- 50 files changed, 1356 insertions(+), 455 deletions(-) diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee index e0994cbfe..e3e9a0caf 100644 --- a/app/locale/ar.coffee +++ b/app/locale/ar.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi no_ie: "CodeCombat لا يعمل في Internet Explorer 8 أو أقل. آسف!" # Warning that only shows up in IE8 and older no_mobile: "لم يصمم CodeCombat للهواتف النقالة وقد لا يعمل!" # Warning that shows up on mobile devices play: "إلعب" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "اه أوه، متصفحك قديم جدا لتشغيل CodeCombat. آسف!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "يمكنك محاولة على أي حال، لكنه ربما لن يعمل." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "الصعوبة:" @@ -89,8 +95,6 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi campaign_player_created_description: "... فيها تقاتل ضد الإبداع الخاص بـزميلك الحرفيّ الساحر." campaign_classic_algorithms: "الخوارزميات التقليديّة" campaign_classic_algorithms_description: "... فيها تتعلّم خوارزميّات الأكثر شعبيّة في علوم الحاسب الآلي." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "إنشاء حساب" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "خطأ في تحميل من الخادم" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee index 02ea1e906..d3332d086 100644 --- a/app/locale/bg.coffee +++ b/app/locale/bg.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "български език", englishDescri no_ie: "CodeCombat не работи под Internet Explorer 8 или по-стари версии. Съжалявам!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat не е направен за мобилни устройства и може да не работи!" # Warning that shows up on mobile devices play: "Играй" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "О, не! Браузърът ти е твърде стар за CodeCombat. Съжалявам!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Все пак можеш да опиваш, но най-вероятно няма да проработи." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "български език", englishDescri # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" buy_gems: "Купи скъпоценни камъни" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Предишни капмании" anonymous: "Анонимен играч" level_difficulty: "Трудност" @@ -89,8 +95,6 @@ module.exports = nativeDescription: "български език", englishDescri # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." campaign_classic_algorithms: "Класически алгоритми" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Създай Профил" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "български език", englishDescri # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "български език", englishDescri # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "български език", englishDescri # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "български език", englishDescri # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "български език", englishDescri # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index 71d82f3b9..94f614363 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr no_ie: "CodeCombat no funciona en Internet Explorer 8 o versions anteriors. Perdó!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat no ha estat dissenyat per dispositius mòbils i per tant no funcionarà!" # Warning that shows up on mobile devices play: "Jugar" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Uh oh, el teu navegador és massa antic per fer funcionar CodeCombat. Perdó!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Pots probar-ho igualment, però el més segur és que no funcioni." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr change_hero: "Canviar heroi" # Go back from choose inventory to choose hero choose_inventory: "Equipar objectes" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Campanyes antigues" anonymous: "Jugador anònim" level_difficulty: "Dificultat: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr campaign_player_created_description: "... on lluites contra la creativitat dels teus companys Artisan Wizards." campaign_classic_algorithms: "Algoritmes classics" campaign_classic_algorithms_description: "... on pots aprendre els algoritmes més populars de l'informàtica." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Crear un compte" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Escull el teu heroi" programming_language: "Llenguatge de programació" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Error de carrega del servidor" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr legal: page_title: "Legalitat" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." privacy_title: "Privacitat" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Seguretat" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee index cf940a772..2b3281da2 100644 --- a/app/locale/cs.coffee +++ b/app/locale/cs.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr no_ie: "Omlouváme se, ale CodeCombat boužel nefunguje v Internet Exploreru 8 nebo starším." # Warning that only shows up in IE8 and older no_mobile: "CodeCombat není navržen pro mobilní zařízení a nemusí fungovat správně!" # Warning that shows up on mobile devices play: "Hrát" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Obtížnost: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr campaign_player_created_description: "...ve kterých bojujete proti kreativitě ostatních Zdatných Kouzelníků." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Vytvořit účet" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr legal: page_title: "Licence" opensource_intro: "CodeCombat je zdarma a plně open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Podívejte se na " github_url: "naši stránku na GitHubu" opensource_description_center: "a pokud se vám chce, můžete i pomoct! CodeCombat je vystavěn na několika oblíbených svobodných projektech. Podívejte se na" @@ -894,7 +917,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr practices_title: "Doporučené postupy" practices_description: "Toto je příslib našeho přístupu v jednoduchém jazyce." privacy_title: "Soukromí" - privacy_description: "Neprodáme vaše osobní informace. Náš plán na zhodnocení je založen na poskytování pracovních příležitostí, přesto si můžete být jisti, že vaše osobní informace nebudou distribuovány bez vašeho plného souhlasu." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Zabezpečení" security_description: "Usilujeme o to, abychom udrželi vaše osobní informace v bezpečí. Jako otevřený projekt jsme přístupni komukoliv k provedení kontroly kódu pro zlepšení našich bezpečnostních systémů." email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr email_description_suffix: "nebo skrze odkazy v odeslaných emailech si můžete nastavit nebo se kdykoliv odhlásit z naší korespondence." cost_title: "Cena" cost_description: "Momentálně je CodeCombat 100% zdarma! Naší snahou je udržet přístup zdarma, abychom dali možnost hrát co největšímu množství lidí. V případě nutnosti budeme muset přejít na placený vstup nebo platbu za přístup k určitému obsahu, ale raději bychom se tomu vyhnuli. S trochou štěstí doufáme v následující plán monetizace:" - recruitment_title: "Nábor" - recruitment_description_prefix: "Zde na CodeCombatu se stanete mocným kouzelníkem a to nejen ve hře, ale i v reálném životě." - url_hire_programmers: "O dobré programátory je stále velký zájem " - recruitment_description_suffix: "takže až se vypracujete a pokud budete souhlasit, budeme demonstrovat vaše nejlepší programátorské úspěchy tisícovkám zaměstnavatelů, kteří by vás rádi zaměstnali. Ti nám zaplatí něco málo, ale vám pak zaplatí " - recruitment_description_italic: "daleko více," - recruitment_description_ending: "tato hra zůstane zdarma a všichni budou spokojeni. Takový je plán." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights a Licence" contributor_title: "Licenční ujednání přispívatelů (CLA)" contributor_description_prefix: "Všichni přispívatelé jak na webu tak do projektu na GitHubu spadají pod naše " diff --git a/app/locale/da.coffee b/app/locale/da.coffee index 4d4b8ca42..ed5ce5386 100644 --- a/app/locale/da.coffee +++ b/app/locale/da.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans no_ie: "CodeCombat kan desværre ikke køre i Internet Explorer 8 eller ældre. Beklager!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat er ikke designet til mobile enheder og vil måske ikke virke!" # Warning that shows up on mobile devices play: "Spil" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Åh åh, din browser er for gammel til at køre CodeCombat. Beklager!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Du kan godt prøve alligevel, men det vil nok ikke virke." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Sværhedsgrad: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans campaign_player_created_description: "... hvor du kæmper mod dine med-Kunsthåndværker-troldmænds kreativitet." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "opret ny konto" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee index 360343a92..0087e1ea0 100644 --- a/app/locale/de-AT.coffee +++ b/app/locale/de-AT.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: no_ie: "CodeCombat läuft nicht im IE8 oder älteren Browsern. Tut uns Leid!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat ist nicht für Mobilgeräte optimiert und funktioniert möglicherweise nicht." # Warning that shows up on mobile devices play: "Spielen" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Oh! Dein Browser ist zu alt für CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Du kannst es trotzdem versuchen, aber es wird wahrscheinlich nicht funktionieren." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # change_hero: "Change Hero" # Go back from choose inventory to choose hero choose_inventory: "Gegenstände ausrüsten" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Schwierigkeit: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: campaign_player_created_description: "... in welchem Du gegen die Kreativität eines Artisan Zauberers kämpfst." campaign_classic_algorithms: "Klassiche Algorithmen" campaign_classic_algorithms_description: "... in welchem du die populärsten Algorithmen der Informatik lernst." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Registrieren" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Wähle deinen Helden" programming_language: "Programmiersprache" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Fehler beim Laden vom Server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: legal: page_title: "Rechtliches" opensource_intro: "CodeCombat ist Free-to-Play und vollständig Open Source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Schau dir " github_url: "unsere GitHub-Seite" opensource_description_center: " an und mach mit wenn Du möchtest! CodeCombat baut auf duzenden Open Source Projekten auf, und wir lieben sie. Schau dir die Liste in " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: practices_title: "Best Practices" practices_description: "Dies sind unsere Versprechen an dich, den Spieler, in weniger Fachchinesisch." privacy_title: "Datenschutz" - privacy_description: "Wir werden deine persönlichen Daten nicht verkaufen. Letztenendes beabsichtigen wir, durch Vermittlung von Jobs zu verdienen, aber sei versichert, dass wir nicht deine persönlichen Daten ohne deine ausdrückliche Einwilligung interessierten Firmen zur Verfügung stellen werden." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Datensicherheit" security_description: "Wir streben an, deine persönlichen Daten sicher zu verwahren. Als Open Source Projekt ist unsere Site frei zugänglich für jedermann, auch um unsere Sicherheitsmaßnahmen in Augenschein zu nehmen und zu verbessern." email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: email_description_suffix: "oder durch von uns gesendete Links kannst du jederzeit deine Einstellungen ändern und Abonnements kündigen." cost_title: "Kosten" cost_description: "CodeCombat ist zur Zeit 100% kostenlos! Eines unserer Hauptziele ist, es dabei zu belassen, so dass es so viele Leute wie möglich spielen können, unabhängig davon in welcher Lebenssituation sie sich befinden. Falls dunkle Wolken aufziehen, könnten wir manche Inhalte im Rahmen eines Abonnements anbieten, aber lieber nicht. Mit etwas Glück können wir die Firma erhalten durch:" - recruitment_title: "Recruiting" - recruitment_description_prefix: "Hier bei CodeCombat kannst du ein mächtiger Zauberer werden, nicht nur im Spiel, sondern auch in der Realität." - url_hire_programmers: "Niemand kann schnell genug Programmierer einstellen." - recruitment_description_suffix: "So wenn du deine Fähigkeiten entwickelt hast und zustimmst, werden wir deine besten Leistungen den tausenden Arbeitgebern demonstrieren, welche nur auf die Gelegentheit warten, dich einzustellen. Sie bezahlen uns ein bisschen, und sie bezahlen dir " - recruitment_description_italic: "jede Menge" - recruitment_description_ending: ", die Seite bleibt kostenlos und jeder ist glücklich. So der Plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights und Lizenzen" contributor_title: "Contributor License Agreement" contributor_description_prefix: "Alle Beiträge, sowohl auf unserer Webseite als auch in unserem GitHub Repository, unterliegen unserer" diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee index 34e2774de..d2bd3ad7e 100644 --- a/app/locale/de-CH.coffee +++ b/app/locale/de-CH.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge no_ie: "CodeCombat funktioniert uf InternetExplorer 8 und älter nid. Sorry!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat isch nid für mobili Grät entwicklet worde und funktioniert vilicht nid!" # Warning that shows up on mobile devices play: "Spiele" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Uh oh, din Browser isch z alt zum CodeCombat spiele. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Du chasches gliich probiere, aber es funktioniert worschinli nid." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Schwierigkeit: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge campaign_player_created_description: "... i dene du gege d Kreativität vome Handwerker Zauberer kämpfsch." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Account erstelle" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge legal: page_title: "Rechtlichs" opensource_intro: "CodeCombat isch free to play und komplett Open Source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Lueg dir " github_url: "üsi GitHub Siite" opensource_description_center: "ah und hilf mit, wennd magsch! CodeCombat isch uf dutzendi Open Source Projekt ufbaut und mir liebed sie. Lueg i " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge practices_title: "Respektvolli bewährti Praxis" practices_description: "Das sind üsi Verspreche a dich, de Spieler, in bitz weniger Fachchinesisch." privacy_title: "Dateschutz" - privacy_description: "Mir verchaufed kei vo dine persönliche Informatione. Mir hend vor zum irgendwenn durch Rekrutierig Geld z verdiene, aber bis versicheret, dass mir nid dini persönliche Date a interessierti Firmene wiiter gebed ohni dis usdrücklich Iverständnis." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Sicherheit" security_description: "Mir bemühed üs, dini persönliche Informatione sicher ufzbewahre. Als es Open Source Projekt isch üsi Siite offe für jede, wo gern möcht üsi Security System besichtige und verbessere." email_title: "E-Mail" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge email_description_suffix: "oder dur d Links i de E-Mails wo mir schicked, chasch du jederziit dini Preferänze ändere und dich ganz eifach us de Mailing-Liste neh." cost_title: "Chöste" cost_description: "Im Moment isch CodeCombat 100% gratis! Eis vo üsne Hauptziel isch, dass das so bliibt, damit so viel Lüüt wie möglich chönd spiele, egal wo sie sich im Lebe befinded. Sötted dunkli Wolke am Horizont ufzieh chas sii, dass mir müed en Teil vom Inhalt chostepflichtig mache, aber es isch üs lieber, wenn da nid passiert. Mit chli Glück werded mir fähig sii, s Unternehme ufrecht z erhalte und zwor mit:" - recruitment_title: "Rekrutierig" - recruitment_description_prefix: "Do uf CodeCombat wirsch du en mächtige Zauberer - nid nur ingame, sonder au im echte Lebe." - url_hire_programmers: "Niemer cha Programmierer schnell gnueg astelle" - recruitment_description_suffix: "das heisst, sobald du dini Fähigkeite gschärft hesch, und wenn du zuestimmsch, werded mir dini beste Programmiererfolg de tuusige vo Arbeitgeber zeige, wo nur druf warted, dich chöne azstelle. Sie zahled üs es bitz öppis, sie zahled dir" - recruitment_description_italic: "ziemli viel" - recruitment_description_ending: "d Siite bliibt gratis und alli sind glücklich. Das isch de Plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index 7bd49458c..c16e3adee 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: no_ie: "CodeCombat läuft nicht im IE8 oder älteren Browsern. Tut uns Leid!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat ist nicht für Mobilgeräte optimiert und funktioniert möglicherweise nicht." # Warning that shows up on mobile devices play: "Spielen" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Oh! Dein Browser ist zu alt für CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Du kannst es trotzdem versuchen, aber es wird wahrscheinlich nicht funktionieren." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: change_hero: "Held wechseln" # Go back from choose inventory to choose hero choose_inventory: "Gegenstände ausrüsten" buy_gems: "Edelsteine kaufen" + campaign_forest: "Forest Kampagne" + campaign_dungeon: "Dungeon Kampagne" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Ältere Kampagne" anonymous: "Anonymer Spieler" level_difficulty: "Schwierigkeit: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: campaign_player_created_description: "... in welchem Du gegen die Kreativität eines Artisan Zauberers kämpfst." campaign_classic_algorithms: "Klassiche Algorithmen" campaign_classic_algorithms_description: "... in welchem du die populärsten Algorithmen der Informatik lernst." - campaign_forest: "Forest Kampagne" - campaign_dungeon: "Dungeon Kampagne" login: sign_up: "Registrieren" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: prompt_body: "Benötigst du mehr?" prompt_button: "Laden betreten" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Wähle deinen Helden" programming_language: "Programmiersprache" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Fehler beim Laden vom Server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: legal: page_title: "Rechtliches" opensource_intro: "CodeCombat ist Free-to-Play und vollständig Open Source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Schau dir " github_url: "unsere GitHub-Seite" opensource_description_center: " an und mach mit wenn Du möchtest! CodeCombat baut auf duzenden Open Source Projekten auf, und wir lieben sie. Schau dir die Liste in " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: practices_title: "Best Practices" practices_description: "Dies sind unsere Versprechen an dich, den Spieler, in weniger Fachchinesisch." privacy_title: "Datenschutz" - privacy_description: "Wir werden deine persönlichen Daten nicht verkaufen. Letztenendes beabsichtigen wir, durch Vermittlung von Jobs zu verdienen, aber sei versichert, dass wir nicht deine persönlichen Daten ohne deine ausdrückliche Einwilligung interessierten Firmen zur Verfügung stellen werden." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Datensicherheit" security_description: "Wir streben an, deine persönlichen Daten sicher zu verwahren. Als Open Source Projekt ist unsere Site frei zugänglich für jedermann, auch um unsere Sicherheitsmaßnahmen in Augenschein zu nehmen und zu verbessern." email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: email_description_suffix: "oder durch von uns gesendete Links kannst du jederzeit deine Einstellungen ändern und Abonnements kündigen." cost_title: "Kosten" cost_description: "CodeCombat ist zur Zeit 100% kostenlos! Eines unserer Hauptziele ist, es dabei zu belassen, so dass es so viele Leute wie möglich spielen können, unabhängig davon in welcher Lebenssituation sie sich befinden. Falls dunkle Wolken aufziehen, könnten wir manche Inhalte im Rahmen eines Abonnements anbieten, aber lieber nicht. Mit etwas Glück können wir die Firma erhalten durch:" - recruitment_title: "Recruiting" - recruitment_description_prefix: "Hier bei CodeCombat kannst du ein mächtiger Zauberer werden, nicht nur im Spiel, sondern auch in der Realität." - url_hire_programmers: "Niemand kann schnell genug Programmierer einstellen." - recruitment_description_suffix: "So wenn du deine Fähigkeiten entwickelt hast und zustimmst, werden wir deine besten Leistungen den tausenden Arbeitgebern demonstrieren, welche nur auf die Gelegentheit warten, dich einzustellen. Sie bezahlen uns ein bisschen, und sie bezahlen dir " - recruitment_description_italic: "jede Menge" - recruitment_description_ending: ", die Seite bleibt kostenlos und jeder ist glücklich. So der Plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights und Lizenzen" contributor_title: "Contributor License Agreement" contributor_description_prefix: "Alle Beiträge, sowohl auf unserer Webseite als auch in unserem GitHub Repository, unterliegen unserer" diff --git a/app/locale/el.coffee b/app/locale/el.coffee index 724e281d1..3947e9500 100644 --- a/app/locale/el.coffee +++ b/app/locale/el.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre no_ie: "Το CodeCombat δεν τρέχει σε Internet Explorer 9 ή παλαιότερη έκδοση. Συγνώμη!" # Warning that only shows up in IE8 and older no_mobile: "Το CodeCombat δεν σχεδιάστηκε για κινητά και μπορεί να μην δουλεύει!" # Warning that shows up on mobile devices play: "Παίξε" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Ωχ, ο περιηγητής σας είναι πολύ παλιός για να τρέξει το CodeCombat. Συγνώμη!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Μπορείτε να δοκιμάσετε, αλλά πιθανότατα να μην λειτουργήσει." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # change_hero: "Change Hero" # Go back from choose inventory to choose hero choose_inventory: "Εξοπλίσου με Αντικείμενα" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Παλαιότερες Εκστρατείες" anonymous: "Ανώνυμοι Παίκτες" level_difficulty: "Δυσκολία: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre campaign_player_created_description: "... στην οποία μάχεστε ενάντια στην δημιουργικότητα των συναδέλφων Τεχνιτών Μάγων." campaign_classic_algorithms: "Κλασσικοί Αλγόριθμοι" campaign_classic_algorithms_description: "... στο οποίο μαθαίνετε του πιο δημοφιλής αλγορίθμους της Επιστήμης της Πληροφορικής." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Δημιουργία Λογαριασμού" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee index a81e880fe..d4492aa88 100644 --- a/app/locale/en-AU.coffee +++ b/app/locale/en-AU.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee index 148b893f7..d9ed831b1 100644 --- a/app/locale/en-GB.coffee +++ b/app/locale/en-GB.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights and Licences" contributor_title: "Contributor Licence Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee index d9297dc92..eb1fb863c 100644 --- a/app/locale/en-US.coffee +++ b/app/locale/en-US.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee index 0f814e748..a415e6c9f 100644 --- a/app/locale/es-419.coffee +++ b/app/locale/es-419.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip no_ie: "¡Lo sentimos! CodeCombat no funciona en Internet Explorer 8 o versiones anteriores." # Warning that only shows up in IE8 and older no_mobile: "¡CodeCombat no fue diseñado para dispositivos móviles y quizás no funcione!" # Warning that shows up on mobile devices play: "Jugar" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "¡Oh! ¡Oh! Tu navegador es muy antiguo para correr CodeCombat. ¡Lo Sentimos!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Puedes probar de todas formas, pero probablemente no funcione." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip change_hero: "Cambiar héroe" # Go back from choose inventory to choose hero choose_inventory: "Equipar objetos" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Campañas previas" anonymous: "Jugador Anónimo" level_difficulty: "Dificultad: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip campaign_player_created_description: "... en los que luchas contra la creatividad de tus compañeros Hechiceros Artesanales." campaign_classic_algorithms: "Algorítmos Clásicos" campaign_classic_algorithms_description: "... en la cual aprendes los algorítmos más populares en las Ciencias de la Computación." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Crear Cuenta" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Elige tu héroe" programming_language: "Lenguaje de programación" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Error cargando del servidor" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee index 270cf9246..3a03d1d82 100644 --- a/app/locale/es-ES.coffee +++ b/app/locale/es-ES.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis no_ie: "CodeCombat no funciona en Internet Explorer 8 o anteriores. ¡Lo sentimos!" # Warning that only shows up in IE8 and older no_mobile: "¡CodeCombat no fue diseñado para dispositivos móviles y puede que no funcione!" # Warning that shows up on mobile devices play: "Jugar" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Ay, su navegador es demasiado viejo para ejecutar CodeCombat. ¡Lo sentimos!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Lo puede intentar de todos modos, pero probablemente no va a funcionar." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis change_hero: "Seleccionar Heroe" # Go back from choose inventory to choose hero choose_inventory: "Equipar Objetos" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Campañas Anteriores" anonymous: "Jugador Anonimo" level_difficulty: "Dificultad: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis campaign_player_created_description: "... en las que luchas contra la creatividad de tus compañeros Magos Artesanos." campaign_classic_algorithms: "Algoritmos Clasicos" campaign_classic_algorithms_description: "... donde aprendes los algoritmos mas populares de la informatica." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Crear una cuenta" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Selecciona tu Heroe" programming_language: "Lenguaje de Programación" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Error al cargar desde el servidor." @@ -886,6 +908,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis legal: page_title: "Legal" opensource_intro: "CodeCombat es gratis y totalmente open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Echa un vistazo a " github_url: "nuestro GitHub" opensource_description_center: "y ayúdanos si quieres. CodeCombat está desarrollado sobre docenas de proyectos open source, y nos encantana. Mira " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis practices_title: "Prácticas respetuosas" practices_description: "Esto es lo que te prometemos a ti, el jugador, sin usar mucha jerga legal." privacy_title: "Privacidad" - privacy_description: "No venderemos tu información personal. Tenemos la intención de hacer dinero a través de la contratación con el tiempo, pero puedes estar seguro que no vamos a distribuir tu información personal a las empresas interesadas sin tu consentimiento expreso." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Seguridad" security_description: "Nos esforzamos por mantener segura tu información personal. Como proyecto de código abierto, nuestro sitio está abierto a cualquiera que quiera revisarlo y mejorar nuestros sistemas de seguridad." email_title: "Correo electrónico" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis email_description_suffix: "o a través de los enlaces en los correos que te enviemos, puedes cambiar tus preferencias y darte de baja fácilmente en cualquier momento." cost_title: "Precio" cost_description: "Actualmente, ¡CodeCombat es 100% gratis! Uno de nuestros principales objetivos es mantenerlo así, de forma que el mayor número posible de gente pueda jugar, independientemente de sus posibilidades económicas. Si las cosas se tuercen, quizás tengamos que cobrar suscripciones o por algún contenido, pero preferimos no hacerlo. Con un poco de suerte, podremos mantener la empresa con: " - recruitment_title: "Contratación" - recruitment_description_prefix: "En CodeCombat, te vas a convertir en un poderoso mago no solo en el juego, también en el mundo real." - url_hire_programmers: "Nadie puede contratar programadores con la suficiente rapidez" - recruitment_description_suffix: "así que una vez que hayas afilado tus habilidades y si estás de acuerdo, mostraremos tus mejores logros en programación a los miles de empresas que están deseando tener la oportunidad de contratarte. Ellos nos pagan un poco y ellos te pagan a ti" - recruitment_description_italic: "un montón." - recruitment_description_ending: "La web permanece gratuita y todo el mundo es feliz. Ese es el plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights y Licencias" contributor_title: "Acuerdo de Licencia del Colaborador" contributor_description_prefix: "Todas las colaboraciones, tanto en la web como en nuestro repositorio de GitHub, están sujetas a nuestro" diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee index 08f65927e..5139f5a84 100644 --- a/app/locale/fa.coffee +++ b/app/locale/fa.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", no_ie: "متاسفیم اما بازی بر روی مرورگر های اینترنت اکسپلورر نسخه ۹ به قبل اجرا نمی شود" # Warning that only shows up in IE8 and older no_mobile: "این بازی برای دستگاه های موبایل طراحی نشده است و بر روی آن ها اجرا نمی شود" # Warning that shows up on mobile devices play: "شروع بازی" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "سختی: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", campaign_player_created_description: "... جایی که در مقابل خلاقیت نیرو هاتون قرار میگیرید جادوگران آرتیزان." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "ایجاد حساب کاربری" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee index 4675bca24..b0fe0d705 100644 --- a/app/locale/fi.coffee +++ b/app/locale/fi.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index 54240f7a0..972aab0c2 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t no_ie: "CodeCombat ne fonctionnera pas sous Internet Explorer 8 ou moins. Désolé !" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat n'a pas été créé pour les plateformes mobiles donc il est possible qu'il ne fonctionne pas correctement ! " # Warning that shows up on mobile devices play: "Jouer" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Oh oh, votre navigateur est trop vieux pour executer CodeCombat. Désolé!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Vous pouvez essayer quand même, mais celà ne marchera probablement pas." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "français", englishDescription: "French", t change_hero: "Changer le Héro" # Go back from choose inventory to choose hero choose_inventory: "Équiper des objets" buy_gems: "Acheter des gemmes" + campaign_forest: "Campagne de la forêt" + campaign_dungeon: "Compagne du donjon" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Anciennes Campagnes" anonymous: "Joueur anonyme" level_difficulty: "Difficulté: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t campaign_player_created_description: "... Dans laquelle vous serez confrontés à la créativité des votres.Artisan Wizards." campaign_classic_algorithms: "Algorithmes classiques" campaign_classic_algorithms_description: "... dans lesquels vous apprendrez les algorithmes les plus populaires dans l'informatique." - campaign_forest: "Campagne de la forêt" - campaign_dungeon: "Compagne du donjon" login: sign_up: "Créer un compte" @@ -321,7 +325,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # equip: "Equip" # unequip: "Unequip" -# buy_gems: + buy_gems: few_gems: "Quelques gemmes" pile_gems: "Pile de gemmes" chest_gems: "Coffre de gemmes" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "français", englishDescription: "French", t prompt_body: "En voulez-vous plus?" prompt_button: "Entrer dans la boutique" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Choisissez votre Héro" programming_language: "Langage de programmation" @@ -360,7 +379,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t level_to_unlock: "Niveau à débloquer:" restricted_to_certain_heroes: "Seulement certains héros peuvent jouer ce niveau." -# skill_docs: + skill_docs: # writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this read_only: "lecture seulement" action_name: "nom" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # service: "Service" price: "Prix" gems: "Gemmes" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Erreur de chargement du serveur" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t legal: page_title: "Légal" opensource_intro: "CodeCombat est complètement gratuit et open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Regardez " github_url: "notre GitHub" opensource_description_center: "et aidez nous si vous voulez! CodeCombat est construit sur plusieurs projets open source, et nous les aimons. Regardez " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t practices_title: "Bonnes pratiques" practices_description: "Ce sont les promesses que nous vous faisons à vous, le joueur, en jargon un peu juridique." privacy_title: "Vie privée" - privacy_description: "Nous ne vendrons aucune de vos informations personnelles. Nous comptons faire de l'argent éventuellement avec le recrutement, mais soyez assuré que nous ne fournirons aucune de vos informations personnelles à des compagnies intéressées sans votre consentement explicite." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Sécurité" security_description: "Nous faisons tout notre possible pour conserver la confidentialité de vos informations personnelles. En tant que projet open source, notre site est ouvert à tous ceux qui souhaitent examiner et améliorer nos systèmes de sécurité." email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t email_description_suffix: "ou avec des liens disponibles dans nos emails, vous pouvez changer vos préférences ou vous désinscrire à tout moment." cost_title: "Coût" cost_description: "Pour l'instant, CodeCombat est gratuit à 100%! Un de nos principaux objectifs est que ça le reste, pour qu'autant de gens possible puissent y jouer, indépendamment de leur niveau de vie. Si le ciel s'assombrit, nous devrons peut-être rendre les inscriptions payantes ou une partie du contenu, mais nous ne le souhaitons pas. Avec un peu de chance, nous serons capables de soutenir l'entreprise avec :" - recruitment_title: "Recrutement" - recruitment_description_prefix: "Ici chez CodeCombat, vous allez devenir un magicien puissant, pas seulement dans le jeu, mais aussi dans la vie réelle." - url_hire_programmers: "Personne ne peut recruter des développeurs aussi vite" - recruitment_description_suffix: "donc une fois que vous aurez aiguisé votre savoir-faire et si vous l'acceptez, nous montrerons vos meilleurs bouts de code aux milliers d'employeurs qui attendent une chance de vous recruter. Ils nous payent un peu pour ensuite vous payer" - recruitment_description_italic: "beaucoup" - recruitment_description_ending: "le site reste gratuit et tout le monde est content. C'est le but." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights et Licences" contributor_title: "Contributor License Agreement" contributor_description_prefix: "Toute contribution, sur le site et sur le répertoire GitHub, est sujette à nos" diff --git a/app/locale/gl.coffee b/app/locale/gl.coffee index 0f4e6ec9b..85f86d333 100644 --- a/app/locale/gl.coffee +++ b/app/locale/gl.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr no_ie: "CodeCombat non funciona en Internet Explorer 8 ou anteriores. Sentímolo!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat non foi deseñado para dispositivos móbiles e pode que non funcione!" # Warning that shows up on mobile devices play: "Xogar" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Vaia, o seu navegador é demasiado vello para executar CodeCombat. Sentímolo!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Pódeo tentar de todos modos, pero probablemente no vaia a funcionar." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr change_hero: "Seleccionar Heroe" # Go back from choose inventory to choose hero choose_inventory: "Equipar Obxectos" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Campañas Anteriores" anonymous: "Xogador Anónimo" level_difficulty: "Dificultade: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr campaign_player_created_description: "... nas que loitas contra a creatividade dos teus compañeiros Magos Artesáns." campaign_classic_algorithms: "Algoritmos Clásicos" campaign_classic_algorithms_description: "... donde aprendes os algoritmos máis populares da informatica." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Crear unha conta" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Selecciona o teu Heroe" programming_language: "Linguaxe de Programación" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Erro ao cargar dende o servidor." @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr legal: page_title: "Legal" opensource_intro: "CodeCombat é de balde e totalmente código aberto." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Bota un ollo a " github_url: "o noso GitHub" opensource_description_center: "e axúdanos si queres. CodeCombat está desenvolvido sobre ducias de proxectos de código aberto, e estamos encantados. Mira " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr practices_title: "Prácticas respetuosas" practices_description: "Esto é o que che propoñemos a ti, o xogador, sin usar moita terminoloxía legal." privacy_title: "Privacidade" - privacy_description: "Non venderemos a túa información persoal. Temos a intención de facer diñeiro a través da contratación co tempo, pero podes estar seguro que non vamos a distribuir a túa información persoal ás empresas interesadas sin o teu consentimento expreso." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Seguridade" security_description: "Esforzamonos por manter segura a túa información persoal. Como proxecto de código aberto, o noso sitio está aberto a calqueira que queira revisalo e mellorar nosos sistemas de seguridade." email_title: "Correo electrónico" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr email_description_suffix: "ou a través das ligazóns nos correos que che enviemos, podes cambiar as túas preferencias e darte de baixa de xeito doado en calquera momento." cost_title: "Prezo" cost_description: "Actualmente, CodeCombat é 100% de balde! Un dos nosos principais obxectivos é mantenlo así, de forma que o maior número posible de xente poida xogar, independientemente das súass posibilidades económicas. Si as cousas se torcen, quizais teñamos que cobrar suscripcións por algún contido, pero preferimos non facelo. Cun pouco de sorte, poderemos manter a empresa con: " - recruitment_title: "Contratación" - recruitment_description_prefix: "En CodeCombat, vaste convertir nun poderoso mago non solo no xogo, tamén no mundo real." - url_hire_programmers: "Ninguén pode contratar programadores coa suficiente rapidez" - recruitment_description_suffix: "así que unha vez que teñas afiado as túas habilidades e si estás de acordo, mostraremos os teus mellores logros en programación ás miles de empresas que estén desexando ter a oportunidade de contratarte. Eles pagannos un pouco e paganche a ti" - recruitment_description_italic: "moito." - recruitment_description_ending: "A web permanece de balde e todo o mundo é feliz. Ese é o plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights e Licenzas" contributor_title: "Acordo de Licenza do Colaborador" contributor_description_prefix: "Todas as colaboracións, tanto na web como no noso repositorio de GitHub, están suxeitas ao noso" diff --git a/app/locale/he.coffee b/app/locale/he.coffee index 749ed45f3..a4693e33c 100644 --- a/app/locale/he.coffee +++ b/app/locale/he.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", no_ie: "המשחק לא עובד באקפלורר 8 וישן יותר. סליחה!" # Warning that only shows up in IE8 and older no_mobile: "המשחק לא עוצב לטלפונים ואולי לא יעבוד" # Warning that shows up on mobile devices play: "שחק" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "או או, נראה כי הדפדפן שלך יותר מידי ישן כדי להריץ את המשחק. סליחה!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "אתה יכול לנסות בכול מקרה אבל זה כנראה לא יעבוד." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "רמת קושי: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", campaign_player_created_description: "... שבהם תילחם נגד היצירתיות של בעלי-המלאכה." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "הירשם" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee index 60270e56f..7a1fbf1e4 100644 --- a/app/locale/hi.coffee +++ b/app/locale/hi.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee index e1bbd3965..f7e1a85fa 100644 --- a/app/locale/hu.coffee +++ b/app/locale/hu.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t no_ie: "A CodeCombat nem támogatja az Internet Explorer 8, vagy korábbi verzióit. Bocsi!" # Warning that only shows up in IE8 and older no_mobile: "A CodeCombat nem mobil eszközökre lett tervezve. Valószínűleg nem működik helyesen." # Warning that shows up on mobile devices play: "Játssz!" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Hohó, a böngésződ már túl régi ahhoz, hogy a CodeCombat futhasson rajta. Bocsi!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Megpróbálhatod éppen, da valószínűleg nem fog működni.." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Nehézség: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t campaign_player_created_description: "...melyekben Művészi Varázsló társaid ellen kűzdhetsz." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Regisztráció" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/id.coffee b/app/locale/id.coffee index 56f020127..6618d5b7a 100644 --- a/app/locale/id.coffee +++ b/app/locale/id.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind no_ie: "Maaf, CodeCombat tidak bisa dijalankan pada Internet Explorer 8 dan sebelumnya" # Warning that only shows up in IE8 and older no_mobile: "Maaf. CodeCombat tidak dibuat untuk perangkat mobile" # Warning that shows up on mobile devices play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Uh oh, Maaf. Versi broser anda terlalu lama " # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Anda bisa mencoba, tapi mungkin tidak akan berjalan." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Buat Akun" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/it.coffee b/app/locale/it.coffee index fa972ccc2..c0ca2f6b1 100644 --- a/app/locale/it.coffee +++ b/app/locale/it.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t no_ie: "CodeCombat non supporta Internet Explorer 8 o browser precedenti. Ci dispiace!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat non è stato progettato per dispositivi mobile e potrebbe non funzionare!" # Warning that shows up on mobile devices play: "Gioca" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Accidenti, il tuo browser è troppo vecchio per giocare a CodeCombat. Mi spiace!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Puoi provare lo stesso, ma probabilmente non funzionerà." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t change_hero: "Cambia Eroe" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" buy_gems: "Compra Gemme" + campaign_forest: "Campagna nella Foresta" + campaign_dungeon: "Campagna nelle Segrete" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Campagne precedenti" anonymous: "Giocatore Anonimo" level_difficulty: "Difficoltà: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t campaign_player_created_description: "... nei quali affronterai la creatività dei tuoi compagni Stregoni Artigiani." campaign_classic_algorithms: "Algoritmi classici" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." - campaign_forest: "Campagna nella Foresta" - campaign_dungeon: "Campagna nelle Segrete" login: sign_up: "Crea account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t legal: page_title: "Questioni legali" opensource_intro: "CodeCombat è gratuito da giocare e totalmente open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Visita il " github_url: "nostro GitHub" opensource_description_center: "e aiutaci se vuoi! CodeCombat è fatto di molti progetti open-source, e a noi piacciono tutti. Vedi " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t practices_title: "Buone pratiche di rispetto" practices_description: "Queste sono le promesse che ti facciamo, come giocatore, in linguaggio un po' meno legale." privacy_title: "Privacy" - privacy_description: "Non venderemo le tue info personali. Intendiamo far soldi eventualmente tramite assunzioni, ma sta' sicuro che non distribuiremo le tue info personali a ditte interessate senza il tuo consenso esplicito." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Sicurezza" security_description: "Facciamo tutto il possibile per tenere sicure le tue informazioni. Essendo un progetto open source, il nostro sito è aperto liberamente a chiunque per controllare e migliorare i nostri sistemi di sicurezza." email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t email_description_suffix: "o con i link contenuti nei messaggi puoi cambiare le tue preferenze o cancellarti facilmente in qualsiasi momento." cost_title: "Costi" cost_description: "In questo momento CodeCombat è totalmente gratis! Uno dei nostri obiettivi principali è di mantenerlo così, in modo che più persone possibile ci possano giocare, in qualsiasi condizione. Se le cose si mettessero male, potremmo essere costretti a far pagare l'iscrizione ad alcuni contenuti; ma preferiremmo di no. In ogni caso saremo in grado di sostenere la ditta con:" - recruitment_title: "Assunzioni" - recruitment_description_prefix: "Qui in CodeCombat, diventerai un vero mago - non solo nel gioco, ma anche nella vita reale." - url_hire_programmers: "Nessuno riesce a trovare abbastanza programmatori" - recruitment_description_suffix: "quindi quando avrai perfezionato le tue capacità, se sei d'accordo, invieremo dei campioni dei tuoi migliori risultati di programmazione a qualcuna delle migliaia di ditte che muoiono dalla voglia di assumerti. Ci pagheranno qualcosa, ti pagheranno" - recruitment_description_italic: "tantissimo" - recruitment_description_ending: "il sito resta gratuito e tutti siamo contenti. Ecco il progetto." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Diritti e licenze" contributor_title: "Accordo di licenza per i contributori (CLA)" contributor_description_prefix: "Tutti i contributi, qui sul sito e sul deposito GitHub, sono soggetti al nostro" diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee index c7562aa28..a47d573e4 100644 --- a/app/locale/ja.coffee +++ b/app/locale/ja.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", no_ie: "大変申し訳ありませんが、ご利用のブラウザ(IE8以下)はサポートされていません。(ChromeやFirefoxをご利用ください)" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat は携帯端末向けに制作されていないため、動作しない可能性があります。" # Warning that shows up on mobile devices play: "ゲームスタート" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "ご利用のブラウザはCodeCombatを動作させるには古すぎるようです" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "このまま進めることもできますが、正常動作は保証されません" # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "難易度: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "アカウント登録" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index b8a56d42a..619fc2875 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t no_ie: "죄송하지만 코드컴뱃은 인터넷 익스플로러 8에서는 동작하지 않습니다." # Warning that only shows up in IE8 and older no_mobile: "코드 컴뱃은 모바일 기기용으로 제작되지 않았습니다. 아마 동작하지 않을 가능성이 높습니다." # Warning that shows up on mobile devices play: "시작" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "브라우저가 너무 오래된 버전이라 코드 컴뱃을 실행할 수 없습니다." # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "시도해볼 수는 있겠지만..안될 수도 있습니다." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "난이도: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t campaign_player_created_description: "... 당신 동료가 고안한 레벨에 도전하세요 마법사 장인." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "계정 생성" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "서버로부터 로딩하는 데 문제가 발생했습니다." @@ -886,6 +908,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t legal: # page_title: "Legal" opensource_intro: "코드 컴뱃은 무료이며 전적으로 오픈 소스를 기반으로 합니다." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "코드 컴뱃의" github_url: "GitHub" opensource_description_center: "를 확인해보세요. 그리고 원하신다면 함께 도와주세요! 코드 컴뱃은 수천 개의 오픈 소스 프로젝트를 기반으로 만들어졌고 저희는 이들에 대해 깊은 애정을 갖고 있습니다. 한번 " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." privacy_title: "프라이버시" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." email_title: "이메일" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee index 8d23ff9c4..1cc498d2e 100644 --- a/app/locale/lt.coffee +++ b/app/locale/lt.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee index 9dc2d9ea9..d94a7d2d7 100644 --- a/app/locale/ms.coffee +++ b/app/locale/ms.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa no_ie: "CodeCombat tidak berfungsi dalam Internet Explorer 8 dan terdahulu. Maaf!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat tidak dibangunkan untuk telefon mudah-alih dan tablet dan tidak akan berfungsi!" # Warning that shows up on mobile devices play: "Mula" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Uh oh, browser anda terlalu lama untuk CodeCombat berfungsi. Maaf!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Anda boleh mencuba, tapi mungkin ia tidak akan berfungsi." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Buat Akaun" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa legal: page_title: "Undang-Undang" opensource_intro: "CodeCombat adalah percuma untuk bermain dan adalah open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Sila lihat " github_url: "GitHub kami" opensource_description_center: "dan sumbang seberapa mampu! CodeCombat dibina atas beberapa projek open source, dan kami menyukainya. Sila lihat " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" cost_description: "Buat masa ini, CodeCombat adalah 100% percuma! salah satu daripada tujuan kami adalah untuk membiarkan ia sebegitu, supaya ramai boleh bermain, di mana sahaja mereka berada. Jikalau langit menjadi gelap untuk kami, kami akan mengecaj untuk langganan atau untuk beberapa muatan, tapi kami lebih suka untuk tidak berbuat demikian. Jika kami bernasib baik, kami dapat menanggung syarikat kami dengan:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Hakcipta dan Pemelesenan" contributor_title: "Persetujuan Lesen Penyumbang" contributor_description_prefix: "Kesemua sumbangan, termasuk di dalam laman dan di dalam repositiri GitHub, tertakluk kepada" diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee index 482d8dc75..ff0688d5f 100644 --- a/app/locale/nb.coffee +++ b/app/locale/nb.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg no_ie: "CodeCombat kjører ikke på IE8 eller eldre. Beklager!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat ble ikke designet for mobile enheter, og vil kanskje ikke virke!" # Warning that shows up on mobile devices play: "Spill" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Å nei, nettleseren din er for gammel til å kjøre CodeCombat. Beklager!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Du kan prøve likevel, men det vil kanskje ikke virke." ipad_browser: "Dårlige nyheter: CodeCombat kjører ikke i nettleseren på iPad. Gode nyheter: iPad appen vår venter bare på godkjenning av Apple." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg change_hero: "Bytt Helt" # Go back from choose inventory to choose hero choose_inventory: "Ta i bruk gjenstander" buy_gems: "Kjøp Juveler" + campaign_forest: "Skogsfelttog" + campaign_dungeon: "Katakombefelttog" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Gamle felttog" anonymous: "Anonym Spiller" level_difficulty: "Vanskelighetsgrad: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg campaign_player_created_description: "... hvor du kjemper mot kreativiteten til en av dine medspillende Artisan Trollmenn." campaign_classic_algorithms: "Klassiske Algoritmer" campaign_classic_algorithms_description: "... hvor du lærer noen av de mest populære algoritmene innen programmering" - campaign_forest: "Skogsfelttog" - campaign_dungeon: "Katakombefelttog" login: sign_up: "Lag konto" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg prompt_body: "Har du lyst på flere?" prompt_button: "Til Butikken" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Velg Din Helt" programming_language: "Programmeringsspråk" @@ -361,7 +380,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg restricted_to_certain_heroes: "Bare noen helter kan spille dette brettet." skill_docs: - writable: "skrivbar" #"writable" # Hover over "attack" in Your Skills while playing a level to see most of this + writable: "skrivbar" # Hover over "attack" in Your Skills while playing a level to see most of this read_only: "skrivebeskyttet" action_name: "navn" action_cooldown: "Tar" @@ -488,8 +507,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg job_profile: "Jobb Profil" # 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." - sample_profile: "Se en eksempelprofil" #"See a sample profile" - view_profile: "Vis Profilen" #"View Your Profile" + sample_profile: "Se en eksempelprofil" + view_profile: "Vis Profilen" wizard_tab: "Trollmann" wizard_color: "Farge på Trollmannens Klær" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg service: "Tjeneste" price: "Pris" gems: "Juveler" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Feil ved lasting fra server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg legal: page_title: "Juridisk" opensource_intro: "CodeCombat er gratis å spille og helt åpen kildekode." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Ta en titt på siden vår på " github_url: "GitHub" opensource_description_center: "og hjelp gjerne til hvis du har lyst! CodeCombat er basert på dusinvis av åpen kildekode-prosjekter og vi er veldig glade i dem. Se " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg practices_title: "Respektfulle \"Best Practices\"" practices_description: "Dette er våre løfter til deg som spiller, på litt mindre juridisk språk." privacy_title: "Personvern" - privacy_description: "Vi kommer ikke til å selge noen av dine personlige opplysninger. Vi planlegger å tjene penger på rekruttering en dag, men du kan føle deg helt trygg på at vi ikke vil gi ut dine personlige opplysninger til interesserte arbeidsgivere uten eksplisitt godkjenning fra deg." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Sikkerhet" security_description: "Vi gjør alt vi kan for å beskytte dine personlige opplysninger. Som et åpen kildekode-prosjekt kan hvem som helst inspisere og forbedre sikkerhetssystemene våre." email_title: "Epost" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg email_description_suffix: "eller via linker i epostene vi sender til deg, kan du endre hvilke eposter du ønsker å motta og enkelt avslutte abonnementet når som helst." cost_title: "Pris" cost_description: "For øyeblikket er CodeCombat 100% gratis! Et av hovedmålene våre er å fortsette med det, sånn at flest mulig kan spille, uavhengig av livssituasjon. Hvis ting går dårlig må vi kanskje begynne å ta betalt for abonnement eller annet innhold, men vi vil helst slippe. Med litt flaks vil vi klare å holde selskapet i live med:" - recruitment_title: "Rekruttering" - recruitment_description_prefix: "Her på CodeCombat kommer du til å bli en mektig trollmann – ikke bare i spillet, men også i virkeligheten." - url_hire_programmers: "Arbeidsgivere klarer ikke å ansette programmerere raskt nok" - recruitment_description_suffix: "så når du har skjerpet kunnskapene dine, og hvis du godkjenner det, kommer vi til å vise frem de beste kodeprestasjonene dine til de tusenvis av arbeidsgivere som sikler over sjansen til å ansette deg. De betaler oss litt, de betaler deg" - recruitment_description_italic: "mye" - recruitment_description_ending: "CodeCombat forblir gratis og alle er fornøyd. Det er planen." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Kopirettigheter og lisenser" contributor_title: "Lisensavtale for bidragsytere" contributor_description_prefix: "Alle bidrag, både gjort gjennom brukergrensesnittet og i kodelageret på GitHub, er underlagt vår" diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee index 96175f3a2..a78c4997b 100644 --- a/app/locale/nl-BE.coffee +++ b/app/locale/nl-BE.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: no_ie: "CodeCombat werkt niet in IE8 of ouder. Sorry!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat is niet gemaakt voor mobiele apparaten en werkt misschien niet!" # Warning that shows up on mobile devices play: "Speel" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Uh oh, jouw browser is te oud om CodeCombat te kunnen spelen, Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Je kan toch proberen, maar het zal waarschijnlijk niet werken!" # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Moeilijkheidsgraad: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: campaign_player_created_description: "... waarin je ten strijde trekt tegen de creativiteit van andere Ambachtelijke Tovenaars." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Account maken" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Fout bij het laden van de server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: legal: page_title: "Legaal" opensource_intro: "CodeCombat is gratis en volledig open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Bekijk " github_url: "onze GitHub" opensource_description_center: "en help ons als je wil! CodeCombat is gebouwd met de hulp van tientallen open source projecten, en wij zijn er gek op. Bekijk ook " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: practices_title: "Goede Respectvolle gewoonten" practices_description: "Dit zijn onze beloften aan u, de speler, in een iets minder juridische jargon." privacy_title: "Privacy" - privacy_description: "We zullen nooit jouw persoonlijke informatie verkopen. We willen in verloop van tijd geld verdienen dankzij aanwervingen, maar je mag op je beide oren slapen dat wij nooit jouw persoonlijke informatie zullen verspreiden aan geïnteresseerde bedrijven zonder dat jij daar expliciet mee akkoord gaat." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Beveiliging" security_description: "We streven ernaar om jouw persoonlijke informatie veilig te bewaren. Onze website is open en beschikbaar voor iedereen, opdat ons beveiliging systeem kan worden nagekeken en geoptimaliseerd door iedereen die dat wil. Dit alles is mogelijk doordat we volledig open source en transparant zijn." email_title: "E-mail" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: email_description_suffix: "of via urls in de emails die wij verzenden, kan je jouw instellingen wijzigen en ten allen tijden uitschrijven." cost_title: "Kosten" cost_description: "Momenteel is CodeCombat 100% gratis! Één van onze doestellingen is om dit zo te houden, opdat zoveel mogelijk mensen kunnen spelen, onafhankelijk van waar je leeft of wie je bent. Als het financieel moeilijker wordt, kan het mogelijk zijn dat we gaan beginnen met abonnementen of een prijs zetten op bepaalde zaken, maar we streven ernaar om dit te voorkomen. Met een beetje geluk zullen we dit voor altijd kunnen garanderen met:" - recruitment_title: "Aanwervingen" - recruitment_description_prefix: "Hier bij CodeCombat, ga je ontplooien tot een krachtige tovenoor-niet enkel virtueel, maar ook in het echt." - url_hire_programmers: "Niemand kan snel genoeg programmeurs aanwerven" - recruitment_description_suffix: "dus eenmaal je jouw vaardigheden hebt aangescherp en ermee akkoord gaat, zullen we jouw beste programmeer prestaties voorstellen aan duizenden werkgevers die niet kunnen wachten om jou aan te werven. Zij betalen ons een beetje, maar betalen jou" - recruitment_description_italic: "enorm veel" - recruitment_description_ending: "de site blijft volledig gratis en iedereen is gelukkig. Dat is het plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Auteursrechten en licenties" contributor_title: "Licentieovereenkomst voor vrijwilligers" contributor_description_prefix: "Alle bijdragen, zowel op de website als op onze GitHub repository, vallen onder onze" diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index 324ae060b..01fbe4cef 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription no_ie: "CodeCombat werkt niet in IE8 of ouder. Sorry!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat is niet gemaakt voor mobiele apparaten en werkt misschien niet!" # Warning that shows up on mobile devices play: "Speel" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Uh oh, jouw browser is te oud om CodeCombat te kunnen spelen, Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Je kan toch proberen, maar het zal waarschijnlijk niet werken!" # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Moeilijkheidsgraad: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription campaign_player_created_description: "... waarin je ten strijde trekt tegen de creativiteit van andere Ambachtelijke Tovenaars." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Account maken" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Fout bij het laden van de server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription legal: page_title: "Legaal" opensource_intro: "CodeCombat is gratis en volledig open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Bekijk " github_url: "onze GitHub" opensource_description_center: "en help ons als je wil! CodeCombat is gebouwd met de hulp van tientallen open source projecten, en wij zijn er gek op. Bekijk ook " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription practices_title: "Goede Respectvolle gewoonten" practices_description: "Dit zijn onze beloften aan u, de speler, in een iets minder juridische jargon." privacy_title: "Privacy" - privacy_description: "We zullen nooit jouw persoonlijke informatie verkopen. We willen in verloop van tijd geld verdienen dankzij aanwervingen, maar je mag op je beide oren slapen dat wij nooit jouw persoonlijke informatie zullen verspreiden aan geïnteresseerde bedrijven zonder dat jij daar expliciet mee akkoord gaat." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Beveiliging" security_description: "We streven ernaar om jouw persoonlijke informatie veilig te bewaren. Onze website is open en beschikbaar voor iedereen, opdat ons beveiliging systeem kan worden nagekeken en geoptimaliseerd door iedereen die dat wil. Dit alles is mogelijk doordat we volledig open source en transparant zijn." email_title: "E-mail" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription email_description_suffix: "of via urls in de emails die wij verzenden, kan je jouw instellingen wijzigen en ten allen tijden uitschrijven." cost_title: "Kosten" cost_description: "Momenteel is CodeCombat 100% gratis! Één van onze doestellingen is om dit zo te houden, opdat zoveel mogelijk mensen kunnen spelen, onafhankelijk van waar je leeft of wie je bent. Als het financieel moeilijker wordt, kan het mogelijk zijn dat we gaan beginnen met abonnementen of een prijs zetten op bepaalde zaken, maar we streven ernaar om dit te voorkomen. Met een beetje geluk zullen we dit voor altijd kunnen garanderen met:" - recruitment_title: "Aanwervingen" - recruitment_description_prefix: "Hier bij CodeCombat, ga je ontplooien tot een krachtige tovenoor-niet enkel virtueel, maar ook in het echt." - url_hire_programmers: "Niemand kan snel genoeg programmeurs aanwerven" - recruitment_description_suffix: "dus eenmaal je jouw vaardigheden hebt aangescherp en ermee akkoord gaat, zullen we jouw beste programmeer prestaties voorstellen aan duizenden werkgevers die niet kunnen wachten om jou aan te werven. Zij betalen ons een beetje, maar betalen jou" - recruitment_description_italic: "enorm veel" - recruitment_description_ending: "de site blijft volledig gratis en iedereen is gelukkig. Dat is het plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Auteursrechten en licenties" contributor_title: "Licentieovereenkomst voor vrijwilligers" contributor_description_prefix: "Alle bijdragen, zowel op de website als op onze GitHub repository, vallen onder onze" diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee index 2f2971f6b..47d5b45a0 100644 --- a/app/locale/nn.coffee +++ b/app/locale/nn.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/no.coffee b/app/locale/no.coffee index 012c77cc9..0be828d6f 100644 --- a/app/locale/no.coffee +++ b/app/locale/no.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr no_ie: "CodeCombat kjører ikke på IE8 eller eldre. Beklager!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat ble ikke designet for mobile enheter, og vil muligens ikke virke!" # Warning that shows up on mobile devices play: "Spill" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Vanskelighetsgrad: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr campaign_player_created_description: "... hvor du kjemper mot kreativiteten til en av dine medspillende Artisan Trollmenn." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Lag ny konto" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee index 20d7c9852..0608423e1 100644 --- a/app/locale/pl.coffee +++ b/app/locale/pl.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish no_ie: "CodeCombat nie działa na Internet Explorer 8 lub starszym. Przepraszamy!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat nie został zaprojektowany dla urządzeń przenośnych więc może nie działać!" # Warning that shows up on mobile devices play: "Graj" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Wygląda na to, że twoja przeglądarka jest zbyt stara, by obsłużyć CodeCombat. Wybacz!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Możesz spróbowac mimo tego, ale prawdopodobnie gra nie będzie działać." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Poziom trudności: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish campaign_player_created_description: "... w których walczysz przeciwko dziełom Czarodziejów Rzemieślników" campaign_classic_algorithms: "Algorytmy klasyczne" campaign_classic_algorithms_description: "... gdzie nauczysz się najpopularniejszych alogrytmów w Informatyce." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Stwórz konto" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish legal: page_title: "Nota prawna" opensource_intro: "CodeCombat jest całkowicie darmowe i całkowicie open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Zajrzyj na " github_url: "nasz GitHub" opensource_description_center: "i pomóż, jeśli tylko masz ochotę! CodeCombat bazuje na dziesiątkach projektów open source - kochamy je wszystkie. Wpadnij na " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish practices_title: "Ludzkim językiem" practices_description: "Oto nasze obietnice wobec ciebie, gracza, wyrażone po polsku, bez prawniczego żargonu." privacy_title: "Prywatność" - privacy_description: "Nie będziemy sprzedawać żadnych z twoich prywatnych informacji. Planujemy w pewnym momencie zarobić trochę pieniędzy dzięki rekrutacjom, ale możesz spać spokojnie - nie będziemy rozpowszechniać twoich osobistych informacji zainteresowanym firmom bez twojej jednoznacznej zgody." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Bezpieczeństwo" security_description: "Z całych sił staramy się zabezpieczyć twoje prywatne informacje. Jako że jesteśmy projektem open source, każdy może sprawdzić i ulepszyć nasz system zabezpieczeń." email_title: "E-mail" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish email_description_suffix: "lub poprzez linki w e-mailach, które wysyłamy, możesz zmienić swoje ustawienia i w prosty sposób wypisać się z subskrypcji w dowolnym momencie." cost_title: "Koszty" cost_description: "W tym momencie CodeCombat jest w stu procentach darmowe! Jednym z naszych głównych celów jest, by utrzymać taki stan rzeczy, aby jak najwięcej ludzi miało dostęp do gry, bez względu na ich zasobność. Jeśli nadejdą gorsze dni, dopuszczamy możliwość wprowadzenia płatnych subskrypcji lub pobierania opłat za część zawartości, ale wolelibyśmy, by tak się nie stało. Przy odrobinie szczęścia, uda nam się podtrzymać obecną sytuację dzięki:" - recruitment_title: "Rekrutacji" - recruitment_description_prefix: "Dzięki CodeCombat, staniesz się potężnym czarodziejem - nie tylko w grze, ale również w prawdziwym życiu." - url_hire_programmers: "Firmy nie nadążają z zatrudnianiem programistów" - recruitment_description_suffix: "więc kiedy tylko odpowiednio się wyszkolisz i wyrazisz zgodę, zaprezentujemy twoje programistyczne dokonania tysiącom pracodawców tylko czekających, by dać ci pracę. Oni płacą nam trochę, tobie" - recruitment_description_italic: "dużo" - recruitment_description_ending: "strona pozostaje darmowa i wszyscy są szczęśliwi. Tak wygląda plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Prawa autorskie i licencje" contributor_title: "Umowa licencyjna dla współtwórców (CLA)" contributor_description_prefix: "Wszyscy współtwórcy, zarówno ci ze strony jak i ci z GitHuba, podlegają naszemu" diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee index 9ffce693a..bf8c18f41 100644 --- a/app/locale/pt-BR.coffee +++ b/app/locale/pt-BR.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: no_ie: "CodeCombat não roda em versões mais antigas que o Internet Explorer 10. Desculpe!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat não foi projetado para dispositivos móveis e pode não funcionar!" # Warning that shows up on mobile devices play: "Jogar" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Ops, seu navegador é muito antigo para rodar o CodeCombat. Desculpe!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Você pode tentar de qualquer forma, mas provavelmente não irá funcionar." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: change_hero: "Alterar Herói" # Go back from choose inventory to choose hero choose_inventory: "Equipar Items" buy_gems: "Comprar Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Campanhas antigas" anonymous: "Jogador Anônimo" level_difficulty: "Dificuldade: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: campaign_player_created_description: "... nos quais você batalhará contra a criatividade dos seus companheiros feiticeiros Artesãos." campaign_classic_algorithms: "Algoritmos Clássicos" campaign_classic_algorithms_description: "...onde você aprende os algoritmos mais conhecidos em Ciência da Computação." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Criar conta" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Escolha seu Herói" programming_language: "Linguagem de Programação" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Erro ao carregar do servidor" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: legal: page_title: "Jurídico" opensource_intro: "CodeCombat é grátis para jogar e de código completamente aberto." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Confira " github_url: "nosso GitHub" opensource_description_center: "e ajude-nos se você gostar! CodeCombat é construído a partir de dúzias de projetos de código aberto, e nós amamos eles. Veja " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: practices_title: "Respeitáveis Boas Práticas" practices_description: "Essas são nossas promessas para você, o jogador, de uma maneira menos jurídica." privacy_title: "Privacidade" - privacy_description: "Nós não venderemos nenhuma de suas informações pessoais. Nós pretendemos ganhar dinheiro através de recrutamento eventualmente, mas fiquem tranquilos que nós não distribuiremos suas informações pessoais para companhias interessadas sem a sua aprovação explícita." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Segurança" security_description: "Nós lutamos para manter suas informações pessoais a salvo.Como um projeto de código aberto, nosso site é aberto para qualquer um rever e melhorar nossos sistemas de segurança." email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: email_description_suffix: "ou através de links nos emails que enviarmos, você pode trocar as preferências e facilmente se desinscrever a qualquer hora." cost_title: "Custo" cost_description: "Atualmente o CodeCombat é 100% grátis. Um dos nossos principais objetivos é mantê-lo dessa forma, para que, o maior número possível de pessoas possa jogar, independente de seu lugar na vida. Se o céu escurecer, nós poderemos ter que cobrar uma assinatura, ou por algum conteúdo, mas preferimos que não. Com alguma sorte, nós seremos capazes de manter a empresa com:" - recruitment_title: "Recrutamento" - recruitment_description_prefix: "Aqui no CodeCombat, você vai se tornar um poderoso feiticeiro, não apenas no jogo, mas também na vida real." - url_hire_programmers: "Ninguém pode contratar programadores rápido o bastante" - recruitment_description_suffix: "então quando você aumentar suas habilidade e, se concordar, vamos demonstrar suas melhores realizações em codificação para os milhares de empregadores que estão babando para ter a chance de contratá-lo. Eles nos pagam um pouco, eles te pagam" - recruitment_description_italic: "muito" - recruitment_description_ending: "o site continua grátis e todo mundo fica feliz. Esse é o plano." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Direitos Autorais e Licenças" contributor_title: "Contrato de Licença de Colaborador" contributor_description_prefix: "Todos os colaboradores, tanto no nosso site quando no nosso repositório no GitHub estão sujeitos ao nosso" diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index 053815b8e..7ed91940b 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: no_ie: "O CodeCombat não funciona no Internet Explorer 8 ou anterior. Desculpa!" # Warning that only shows up in IE8 and older no_mobile: "O CodeCombat não foi feito para dispositivos móveis e pode não funcionar!" # Warning that shows up on mobile devices play: "Jogar" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Ups, o teu navegador é demasiado antigo para que o CodeCombat funcione. Desculpa!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Mesmo assim podes tentar, mas provavelmente não irá funcionar." ipad_browser: "Más notícias: o CodeCombat não funciona no navegador do iPad. Boas notícias: a nossa aplicação nativa para iPad está à espera da aprovação da Apple." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: change_hero: "Alterar Herói" # Go back from choose inventory to choose hero choose_inventory: "Equipar Itens" buy_gems: "Comprar Gemas" + campaign_forest: "Campanha da Floresta" + campaign_dungeon: "Campanha da Masmorra" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Campanhas Mais Antigas" anonymous: "Jogador Anónimo" level_difficulty: "Dificuldade: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: campaign_player_created_description: "... onde combates contra a criatividade dos teus colegas Feiticeiros Artesãos." campaign_classic_algorithms: "Algoritmos Clássicos" campaign_classic_algorithms_description: "... onde aprendes os algoritmos mais populares da Ciência da Computação." - campaign_forest: "Campanha da Floresta" - campaign_dungeon: "Campanha da Masmorra" login: sign_up: "Criar Conta" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: prompt_body: "Queres obter mais?" prompt_button: "Entra na Loja" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Escolhe o Teu Herói" programming_language: "Linguagem de Programação" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: service: "Serviço" price: "Preço" gems: "Gemas" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Erro ao carregar do servidor" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: legal: page_title: "Legal" opensource_intro: "O CodeCombat é gratuito para jogar e é totalmente open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Confere " github_url: "o nosso GitHub" opensource_description_center: "e ajuda se quiseres! O CodeCombat é construído tendo por base dezenas de projetos open source, os quais nós amamos. Vê " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: practices_title: "Melhores Práticas Respeitosas" practices_description: "Estas são as nossas promessas para contigo, o jogador, com um pouco menos de politiquices." privacy_title: "Privacidade" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Segurança" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." email_title: "E-mail" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: email_description_suffix: "ou através de ligações presentes nos e-mails que enviamos, podes mudar as tuas preferências e parar a tua subscrição facilmente, em qualquer momento." cost_title: "Custo" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" - recruitment_title: "Recrutamento" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Direitos Autorais e Licensas" contributor_title: "Contrato de Licença do Contribuinte (CLA)" contributor_description_prefix: "Todas as contribuições, tanto no sítio como no nosso repositório GitHub, estão sujeitas ao nosso" diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index c82fcfd07..67cff3737 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman 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 play: "Joacă" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button 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." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Dificultate: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman 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_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Crează cont" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman legal: page_title: "Aspecte Legale" opensource_intro: "CodeCombat este free-to-play și complet open source." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Vizitează " 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" @@ -894,7 +917,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman 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: "Noi nu vom vinde nici o informație personală. Intenționăm să obținem profit prin recrutare eventual, dar stați liniștiți , nu vă vom vinde informațiile personale companiilor interesate fără consimțământul vostru explicit." +# privacy_description_2: "We will not sell any of your personal information." 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" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman 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:" - recruitment_title: "Recrutare" - recruitment_description_prefix: "Aici la CodeCombat, vei deveni un vrăjitor puternic nu doar în joc, ci și în viața reală." - url_hire_programmers: "Nimeni nu poate angaja programatori destul de rapid" - recruitment_description_suffix: "așa că odată ce ți-ai dezvoltat abilitățile și esti de acord, noi vom trimite un demo cu cele mai bune realizări ale tale către miile de angajatori care se omoară să pună mâna pe tine. Pe noi ne plătesc puțin, pe tine te vor plăti" - recruitment_description_italic: "mult" - recruitment_description_ending: "site-ul rămâne gratis și toată lumea este fericită. Acesta este planul." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." 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" diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 21020971d..7756018fc 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi no_ie: "CodeCombat не работает в IE8 или более старых версиях. Нам очень жаль!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat не приспособлен для работы на мобильных устройствах и может не работать!" # Warning that shows up on mobile devices play: "Играть" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Ой, ваш браузер слишком стар для запуска CodeCombat. Извините!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Вы всё равно можете попробовать, но, скорее всего, это не будет работать." ipad_browser: "Плохие новости: CodeCombat не запускается в браузере IPad. Хорошие новости: наше нативное приложение для IPad ожидает одобрения от Apple." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi change_hero: "Выбрать героя" # Go back from choose inventory to choose hero choose_inventory: "Выбрать предметы" buy_gems: "Купить самоцветы" + campaign_forest: "Лесная кампания" + campaign_dungeon: "Кампания в подземелье" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Старые кампании" anonymous: "Неизвестный игрок" level_difficulty: "Сложность: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi campaign_player_created_description: "... в которых вы сражаетесь с креативностью ваших друзей Ремесленников." campaign_classic_algorithms: "Классические принципы" campaign_classic_algorithms_description: "... которые чаще всего встречаются в копьютерных науках." - campaign_forest: "Лесная кампания" - campaign_dungeon: "Кампания в подземелье" login: sign_up: "Создать аккаунт" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi prompt_body: "Хотите еще?" prompt_button: "Войти в магазин" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Выберите героя" programming_language: "Язык программирования" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # service: "Service" price: "Цена" gems: "Самоцветы" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Ошибка загрузки с сервера" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi legal: page_title: "Юридическая информация" opensource_intro: "CodeCombat - бесплатный проект с полностью открытым исходным кодом." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Посмотрите " github_url: "наш GitHub" opensource_description_center: "и посодействуйте, если вам понравилось! CodeCombat построен на десятках проектов с открытым кодом, и мы любим их. Загляните в " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi practices_title: "Уважаемые лучшие практики" practices_description: "Это наши обещания тебе, игроку, менее юридическим языком." privacy_title: "Конфиденциальность" - privacy_description: "Мы не будем продавать какую-либо личную информацию. Мы намерены заработать деньги с помощью рекрутинга в конечном счёте, но будьте уверены, мы не будем распространять вашу личную информацию заинтересованным компаниям без вашего явного согласия." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Безопасность" security_description: "Мы стремимся сохранить вашу личную информацию в безопасности. Как проект с открытым исходным кодом, наш сайт открыт для всех в вопросах пересмотра и совершенствования систем безопасности." email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi email_description_suffix: "или через ссылки в email-ах, которые мы отправляем, вы можете изменить предпочтения и легко отписаться в любой момент." cost_title: "Стоимость" cost_description: "В настоящее время, CodeCombat 100% бесплатен! Одной из наших главных целей является сохранить его таким, чтобы как можно больше людей могли играть, независимо от места в жизни. Если небо потемнеет, мы, возможно, введём подписки, возможно, только на некоторый контент, но нам не хотелось бы. Если повезёт, мы сможем поддерживать компанию, используя" - recruitment_title: "Рекрутинг" - recruitment_description_prefix: "Здесь, в CodeCombat, вы собираетесь стать могущественным волшебником не только в игре, но и в реальной жизни." - url_hire_programmers: "Никто не может нанять программистов достаточно быстро" - recruitment_description_suffix: "поэтому, как только вы улучшите свои навыки и будете согласны, мы начнём демонстрировать ваши лучшие программистские достижения тысячам работодателей, пускающих слюни на возможность нанять вас. Они платят нам немного, они платят вам" - recruitment_description_italic: "много" - recruitment_description_ending: "сайт остаётся бесплатным и все счастливы. Таков план." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Авторские права и лицензии" contributor_title: "Лицензионное соглашение соавторов" contributor_description_prefix: "Все вклады, как на сайте, так и на нашем репозитории GitHub, подпадают под наше" diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee index 5ba35aa98..6172439c4 100644 --- a/app/locale/sk.coffee +++ b/app/locale/sk.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", no_ie: "CodeCombat nefunguje v prehliadači Internet Explorer 8 a jeho starších verziách. Ospravedlňujeme sa." # Warning that only shows up in IE8 and older no_mobile: "CodeCombat nebol navrhnutý pre mobilné zariadenia a nemusí na nich fungovať správne!" # Warning that shows up on mobile devices play: "Hraj" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Ajaj, prehliadač je príliš starý. CodeCombat na ňom nepôjde. Je nám to ľúto!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Skúsiť sa to dá, ale asi to nepôjde." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Obtiažnosť." @@ -89,8 +95,6 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", campaign_player_created_description: "... v ktorých sa popasuješ s kreativitou svojich kúzelníckych súdruhov." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Vytvor účet" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee index e377bfa49..c6dbdc816 100644 --- a/app/locale/sl.coffee +++ b/app/locale/sl.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee index d00109df1..1aab0fdcf 100644 --- a/app/locale/sr.coffee +++ b/app/locale/sr.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian no_ie: "CodeCombat не ради у IE8 и старијим верзијама. Жао нам је!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat није дизајниран за мобилне уређаје и може да се деси да не ради!" # Warning that shows up on mobile devices play: "Играј" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Тежина: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian campaign_player_created_description: "... у којима се бориш против креативности својих колега." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Направи Налог" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee index d50afeedf..e6737e009 100644 --- a/app/locale/sv.coffee +++ b/app/locale/sv.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr no_ie: "CodeCombat fungerar tyvärr inte i IE8 eller äldre." # Warning that only shows up in IE8 and older no_mobile: "CodeCombat är inte designat för mobila enhter och fungerar kanske inte!" # Warning that shows up on mobile devices play: "Spela" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Oj då, din webbläsare är för gammal för att köra CodeCombat. Förlåt!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Du kan försöka ändå, men det kommer nog inte fungera." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr change_hero: "Byt Hjälte" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" buy_gems: "Köp ädelstenar" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" anonymous: "Anonym Spelare" level_difficulty: "Svårighetsgrad: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr campaign_player_created_description: "... i vilken du tävlar mot kreativiteten hos andra Hantverkare." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Skapa konto" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr legal: page_title: "Juridik" opensource_intro: "CodeCombat är gratis att spela och helt öppen programvara." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Spana in " github_url: "vår GitHub" opensource_description_center: " och hjälp till om du vill! CodeCombat är byggt på dussintals projekt med öppen källkod, och vi älskar dem. Se " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr practices_title: "Respektfulla \"best practices\"" practices_description: "Dessa är våra löften till dig, spelaren, på lite mindre juristspråk." privacy_title: "Integritet" - privacy_description: "Vi kommer inte att sälja någon av din personliga information. Vi har för avsikt att tjäna pengar genom rekrytering så småningom, men var så säker på att vi inte kommer att distribuera din personliga information till intresserade företag utan ditt explicita samtycke." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Säkerhet" security_description: "Vi strävar efter att hålla din personliga information säker. Eftersom vår källkod är öppen är vår det fritt fram för vem som helst att granska och förbättra våra säkerhetssystem." email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr email_description_suffix: "eller genom länkar i mailen vi skickar kan du ändra dina inställningar och lätt avprenumerera när som helst." cost_title: "Kostnad" cost_description: "För närvarande är CodeCombat 100 % gratis! Ett av våra främsta mål är att behålla det så, så att så många som möjligt kan spela, oavsett plats i livet. Om himlen mörknar, kanske vi behöver ta betalt för prenumerationer eller något innehåll, men helst slipper vi det. Med lite tur lyckas vi hålla liv i företag med:" - recruitment_title: "Rekrytering" - recruitment_description_prefix: "Här på CodeCombat kommer du att bli en mäktig trollkarl - inte bara i spelet, utan också i verkliga livet." - url_hire_programmers: "Ingen kan anställa programmerare tillräckligt snabbt" - recruitment_description_suffix: "så när du har vässat dina kunskaper, och om du godkänner, kommer vi att demonstrera dina största kodbedrifter för de tusentals arbetsgivare som dreglar över chansen att anställa dig. De betalar oss lite, de betalar dig" - recruitment_description_italic: "mycket" - recruitment_description_ending: "sajten fortsätter vara gratis och alla är nöjda. Det är planen." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Upphovsrätt och licenser" contributor_title: "Överenskommelse för bidragarlicens" contributor_description_prefix: "Alla bidrag, både på sajten och på vårt GitHub-repo, faller under vår" diff --git a/app/locale/th.coffee b/app/locale/th.coffee index d2a4c0ba1..96652cba4 100644 --- a/app/locale/th.coffee +++ b/app/locale/th.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices play: "เล่น" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "ลงทะเบียนใหม่" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee index 48ff52524..cee9ae923 100644 --- a/app/locale/tr.coffee +++ b/app/locale/tr.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t no_ie: "CodeCombat maalesef Internet Explorer 8 veya daha eski sürümlerde çalışmaz." # Warning that only shows up in IE8 and older no_mobile: "CodeCombat mobil cihazlar için tasarlanmamıştır bu sebeple mobil cihazlarda çalışmayabilir." # Warning that shows up on mobile devices play: "Oyna" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Olamaz, Tarayıcınız CodeCombat'ı çalıştırmak için çok eski. Üzgünüz!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Deneyebilirsiniz, ama muhtemelen oyun çalışmayacaktır." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t change_hero: "Kahramanı Değiştir" # Go back from choose inventory to choose hero choose_inventory: "Ögeleri Giy" buy_gems: "Taş satın a" + campaign_forest: "Orman Senaryosu" + campaign_dungeon: "Zindan Senaryosu" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Daha Eski Görevler" anonymous: "Anonim Oyuncu" level_difficulty: "Zorluk: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t campaign_player_created_description: "Zanaatkâr Büyücülerin yaratıcılıklarına karşı mücadele etmek için..." campaign_classic_algorithms: "Klasik Algoritmalar" campaign_classic_algorithms_description: "... Bilgisayar Bilimleri'nde öğrendiğiniz en yaygın algoritmalar." - campaign_forest: "Orman Senaryosu" - campaign_dungeon: "Zindan Senaryosu" login: sign_up: "Hesap Oluştur" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "Kahramanınızı Seçin" programming_language: "Programlama Dili" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "Yüklenemiyor" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t legal: page_title: "Hukuki" opensource_intro: "CodeCombat ücretsiz oynanılabilir ve tamamen açık kaynaklıdır." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "İster " github_url: "GitHub'ımıza" opensource_description_center: "bakıver ve hoşuna giderse yardım edebilirsin! CodeCombat bir sürü açık kaynaklı projeden yararlanılarak inşa edilmiştir, hepsini seviyoruz. Bu projeleri görmek istersen " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t practices_title: "Saygı Çerçevesinde En İyi Uygulamalar" practices_description: "Saygıdeğer oyuncu, bunlar size verdiğimiz sözlerimizdir. Daha kolay anlaşılması açısından özet haline indirgenmiştir." privacy_title: "Mahremiyet" - privacy_description: "Hiçbir kişisel bilginizi pazarlamayacağız. Asıl amacımız işe alımlar ile para kazanmaktır. Nihai olarak, sizin onayınız olmadan, veriniz ile ilgilenen hiçbir şirket ile bilgi satışına dair pazarlık yapmayacağımıza dair sizi temin ederiz" +# privacy_description_2: "We will not sell any of your personal information." security_title: "Güvenlik" security_description: "Kişisel bilgilerinizi güvende tutmak için mücadele ediyoruz. Açık kaynaklı bir proje olarak, sitemiz herkesin görüşüne açıktır ve güvenlik sistemimizin geliştirilmesine yardımcı olabilirsiniz." email_title: "Eposta" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t email_description_suffix: "ister size gönderdiğimiz epostadaki linklerden, tercihlerinizi değiştirebilir ve aboneliğinizi anında iptal edebilirsiniz." cost_title: "Ücret" cost_description: "Şu anda CodeCombat tamamıyla ücretsiz! Esas amaçlarımızdan biri bu şekilde devam etmek, bu sayede hayattaki konumu fark etmeksizin olabildiğince çok insan oynayarak kodlamayı öğrenebilir. Eğer koşullar olumsuz yönde değişirse, abonelik veya bazı içerikler için belirli ücretler talep edilebilir, ama bunu tercih etmeyiz. Temennimiz şudur ki, şirketi şu biçimde sürdürmeye devam edebiliriz:" - recruitment_title: "İşe Alım" - recruitment_description_prefix: "CodeCombat'te, kudretli bir büyücü haline geleceksiniz–sadece oyunda değil, gerçek hayatta da." - url_hire_programmers: "Kimse yeterince hızlı bir şekilde programcı işe alamaz," - recruitment_description_suffix: "bu sebeple, becerilerinizi yeterince geliştirdiğinizde ve siz de kabul ettiğiniz takdirde, becerilerinize dair kısa bir tanıtımı, sizi işe almak için can atan kişilere göndereceğiz. Bize biraz, size" - recruitment_description_italic: "bayağı ödeyecekler" - recruitment_description_ending: "böylece site ücretsiz kalacak ve herkes memnun olacak. Plan bu." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Telif Hakları ve Lisanslar" contributor_title: "Katılımcı Lisans Sözleşmesi" contributor_description_prefix: "GitHub ve siteye yapılan tüm katılımlar, devam etmeden önce kabul etmeniz gereken" diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index c4cb63bb9..5de3e9a20 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "українська мова", englishDesc no_ie: "На жаль, CodeCombat не працює в IE8 та старіших версіях!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat не призначений для мобільних приладів і може не працювати!" # Warning that shows up on mobile devices play: "Грати" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "Вибачте, але ваш браузер занадто старий для гри CodeCombat" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Ви все одно можете спробувати, хоча навряд чи вийде" # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "українська мова", englishDesc change_hero: "Змінити героя" # Go back from choose inventory to choose hero choose_inventory: "Одягнути предмети" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "Старі кампанії" anonymous: "Гравець-анонім" level_difficulty: "Складність: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "українська мова", englishDesc campaign_player_created_description: "... у яких ви змагаєтесь у креативності із вашими друзями-Архітекторами." campaign_classic_algorithms: "Класичні алгоритми" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "створити акаунт" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "українська мова", englishDesc # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -576,6 +595,7 @@ module.exports = nativeDescription: "українська мова", englishDesc level_tab_thangs_conditions: "Початковий статус" level_tab_thangs_add: "Додати об'єкти" delete: "Видалити" +# duplicate: "Duplicate" rotate: "Повернути" level_settings_title: "Налаштування" level_component_tab_title: "Поточні компоненти" @@ -800,6 +820,9 @@ module.exports = nativeDescription: "українська мова", englishDesc service: "Сервіс" price: "Ціна" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -885,6 +908,7 @@ module.exports = nativeDescription: "українська мова", englishDesc legal: page_title: "Юридична інформація" opensource_intro: "CodeCombat - безкоштовна гра з повністю відкритим кодом." +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Завітайте" github_url: "на наш GitHub" opensource_description_center: "та долучайтесь, якщо хочете! CodeCombat побудовано на десятках проектів із вікритим кодом. і ми любимо їх. Перегляньте " @@ -893,7 +917,7 @@ module.exports = nativeDescription: "українська мова", englishDesc practices_title: "Шановні найкращі гравці" # practices_description: "These are our promises to you, the player, in slightly less legalese." privacy_title: "Конфіденційність" - privacy_description: "Ми не продаватимемо ніяку вашу особисту інформацію. Ми маємо намір заробити гроші за допомогою кінцевого результату, але будьте впевнені, ми не будемо поширювати Вашу особисту інформацію для зацікавлених компаній без вашої явної згоди." +# privacy_description_2: "We will not sell any of your personal information." security_title: "Безпека" security_description: "Ми прагнемо зберегти вашу особисту інформацію в безпеці. Як проект з відкритим кодом, наш сайт є вільно відкритим для всіх, щоб переглянути та удосконалити наші системи безпеки." email_title: "Email" @@ -902,12 +926,7 @@ module.exports = nativeDescription: "українська мова", englishDesc email_description_suffix: "або через посилання в повідомленням котрі ми присилаємо, ви можете змінити ваші уподобання і легко відмовитись від підписки в будь-який час." cost_title: "Вартість" cost_description: "На даний час, CodeCombat є безкоштовним на усі 100%! Однією з наших цілей є рухатись у цьому ж напрямку, так що у цю гру можуть грати стільки людей, наскільки це можливо, незалежно від місця проживання. Якщо настануть важкі часи, ми будем змушені стягувати плату за певний контент, але ми б не хотіли цього. Якщо пощастить, ми зможемо підтримувати компанію разом з:" - recruitment_title: "Доповнення" - recruitment_description_prefix: "Тут у CodeCombat, ви станете могутнім чарівником не лише у грі, але також і у реальному житті." - url_hire_programmers: "Ніхто не може найняти програмістів одразу" - recruitment_description_suffix: "отже як тільки ви заточите свої навики, і якщо ви погодитесь, ми продемонструєм ваші найкращі досягнення у кодуванні тисячам роботодавців котрі пускають слюні щоб не впустити можливості найняти вас. Вони платять нам не багато, вони платять вам" - recruitment_description_italic: "багато" - recruitment_description_ending: "сайт залишиться безкоштовним і кожен буде задоволеним. Такий план." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Авторські права та ліцензії" contributor_title: "Авторська ліцензійна згода" contributor_description_prefix: "Усі права, як на сайті так і у нашому сховищі GitHub, є у відповідності з нашими" diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee index 99ffb7ee4..fe4a58ce2 100644 --- a/app/locale/ur.coffee +++ b/app/locale/ur.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee index 74c314d40..1cc502633 100644 --- a/app/locale/vi.coffee +++ b/app/locale/vi.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn no_ie: "Codecombat không chạy trong Internet Explorer 8 hoặc cũ hơn. Xin lỗi!" # Warning that only shows up in IE8 and older no_mobile: "Codecombat không được thiết kế cho các thiết bị di động và có thể không hoạt động được!" # Warning that shows up on mobile devices play: "Chơi" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "Khó: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "Tạo tài khoản" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index d7217461e..8173dce3d 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese no_ie: "抱歉! Internet Explorer 8 等旧式预览器无法使用本网站。" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat 不是针对手机设备设计的,所以可能无法达到最好的体验!" # Warning that shows up on mobile devices play: "开始游戏" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "噢, 你的浏览器太老了, 不能运行CodeCombat. 抱歉!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "你可以继续重试下去,但八成不起作用,更新浏览器吧亲~" # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese change_hero: "重新选择英雄" # Go back from choose inventory to choose hero choose_inventory: "装备道具" buy_gems: "购买宝石" + campaign_forest: "森林战役" + campaign_dungeon: "地牢战役" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" older_campaigns: "旧的战役" anonymous: "匿名玩家" level_difficulty: "难度:" @@ -89,8 +95,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese campaign_player_created_description: "……在这里你可以与你的小伙伴的创造力战斗 技术指导." campaign_classic_algorithms: "经典算法" campaign_classic_algorithms_description: "... 你可以在此学习到计算机科学中最常用的算法" - campaign_forest: "森林战役" - campaign_dungeon: "地牢战役" login: sign_up: "注册" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + choose_hero: choose_hero: "请选择您的英雄" programming_language: "编程语言" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "载入失败" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese legal: page_title: "法律" opensource_intro: "CodeCombat 是一个自由发挥,完全开源的项目。" +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "查看 " github_url: "我们的 GitHub" opensource_description_center: "并做你想做的修改吧!CodeCombat 是构筑在几十个开源项目之上的,我们爱它们。请查阅" @@ -894,7 +917,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese practices_title: "尊重最佳实践" practices_description: "这是我们对您的承诺,即玩家,尽管这在法律用语中略显不足。" privacy_title: "隐私" - privacy_description: "我们不会出售您的任何个人信息。我们计划最终通过招聘来盈利,但请您放心,未经您的明确同意,我们不会将您的个人信息出售有兴趣的公司。" +# privacy_description_2: "We will not sell any of your personal information." security_title: "安全" security_description: "我们竭力保证您的个人信息安全性。作为一个开源项目,任何人都可以检讨并改善我们自由开放的网站的安全性。" email_title: "电子邮件" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese email_description_suffix: "或者我们发送的邮件中的链接,您可以随时更改您的偏好设置或者随时取消订阅。" cost_title: "花费" cost_description: "目前来说,CodeCombat 是完全免费的!我们的主要目标之一也是保持目前这种方式,让尽可能多的人玩得更好,不论是否是生活中。如果天空变暗,我们可能会对某些内容采取订阅收费,但我们宁愿不那么做。运气好的话,我们可以维持公司,通过:" - recruitment_title: "招募" - recruitment_description_prefix: "在 CodeCombat 这里,你将得以成为一名法力强大的“巫师”,不只是在游戏中,更在生活中。" - url_hire_programmers: "没有人能以足够快速度招聘程序员," - recruitment_description_suffix: "所以一旦你的技能成熟并且得到你的同意,我们将战士你的最佳编码成就给上万名雇主,希望他们垂涎欲滴。而他们支付给我们一点点报酬,并且付给你工资," - recruitment_description_italic: "“一大笔”" - recruitment_description_ending: "。而这网站也就能保持免费,皆大欢喜。计划就是这样。" +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "版权与许可" contributor_title: "贡献者许可协议" contributor_description_prefix: "所有对本网站或是 GitHub 代码库的贡献都依照我们的" diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index 44b52a889..057020f25 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese no_ie: "抱歉!Internet Explorer 8 等舊的瀏覽器打不開此網站" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat 不是針對手機設備設計的,所以可能會出問題!" # Warning that shows up on mobile devices play: "開始遊戲" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "難度" @@ -89,8 +95,6 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese campaign_player_created_description: "...挑戰同伴的創意 技術指導." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "註冊" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee index 4ca67cb26..325404d2b 100644 --- a/app/locale/zh-WUU-HANS.coffee +++ b/app/locale/zh-WUU-HANS.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # no_ie: "CodeCombat does not run in Internet Explorer 8 or older. Sorry!" # Warning that only shows up in IE8 and older # no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!" # Warning that shows up on mobile devices # play: "Play" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button # old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari # old_browser_suffix: "You can try anyway, but it probably won't work." # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" # level_difficulty: "Difficulty: " @@ -89,8 +95,6 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # campaign_player_created_description: "... in which you battle against the creativity of your fellow Artisan Wizards." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" # login: # sign_up: "Create Account" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" # loading_error: # could_not_load: "Error loading from server" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # legal: # page_title: "Legal" # opensource_intro: "CodeCombat is free to play and completely open source." +# opensource_intro_2: "CodeCombat completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -894,7 +917,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent." +# privacy_description_2: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" # cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# recruitment_title: "Recruitment" -# recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life." -# url_hire_programmers: "No one can hire programmers fast enough" -# recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you" -# recruitment_description_italic: "a lot" -# recruitment_description_ending: "the site remains free and everybody's happy. That's the plan." +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee index 7ef4945ec..e80869dc5 100644 --- a/app/locale/zh-WUU-HANT.coffee +++ b/app/locale/zh-WUU-HANT.coffee @@ -4,6 +4,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio no_ie: "對弗住!箇網站叻 Internet Explorer 8 箇粒老個瀏覽器嘸處用。" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat 勿是照手機設備設計個,怪得嘸數达弗到頂讚個享受!" # Warning that shows up on mobile devices play: "遊戲開打" # The big play button that just starts playing a level +# try_it: "Try It" # Alternate wording for Play button old_browser: "啊耶, 爾個瀏覽器忒老哉, 嘸處運行 CodeCombat。對弗住險!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "爾試叻好試多遍,不過嘸大用場個。" # ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval." @@ -68,6 +69,11 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # change_hero: "Change Hero" # Go back from choose inventory to choose hero # choose_inventory: "Equip Items" # buy_gems: "Buy Gems" +# campaign_forest: "Forest Campaign" +# campaign_dungeon: "Dungeon Campaign" +# subscription_required: "Subscription Required" +# free: "Free" +# subscribed: "Subscribed" # older_campaigns: "Older Campaigns" # anonymous: "Anonymous Player" level_difficulty: "難度:" @@ -89,8 +95,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio campaign_player_created_description: "……徠箇搭爾好搭爾夥計造起來個賭打 技術相幫." # campaign_classic_algorithms: "Classic Algorithms" # campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." -# campaign_forest: "Forest Campaign" -# campaign_dungeon: "Dungeon Campaign" login: sign_up: "註冊" @@ -332,6 +336,21 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # prompt_body: "Do you want to get more?" # prompt_button: "Enter Shop" +# subscribe: +# subscribe_title: "Subscribe" +# levels: "Unlock 25 levels! With 5 new ones every week!" +# heroes: "More powerful heroes!" +# gems: "3500 bonus gems every month!" +# items: "Over 250 bonus items!" +# parents: "For Parents" +# parents_title: "Your child will learn to code." +# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." +# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." +# subscribe_button: "Subscribe Now" +# stripe_description: "Monthly Subscription" +# subscription_required_to_play: "You'll need a subscription to play this level." + # choose_hero: # choose_hero: "Choose Your Hero" # programming_language: "Programming Language" @@ -801,6 +820,9 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # service: "Service" # price: "Price" # gems: "Gems" +# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" +# 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!" loading_error: could_not_load: "讀取失敗" @@ -886,6 +908,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio legal: page_title: "律法" opensource_intro: "CodeCombat 是一個候自發揮,整個開源個項目。" +# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "望 " github_url: "我裏個 GitHub" opensource_description_center: "做爾想做個改動嘈!CodeCombat 是起徠幾十個開源項目上向,我裏中意渠裏。望" @@ -894,7 +917,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio practices_title: "尊重最讚真做" practices_description: "箇是我裏對爾個保證,也佩是攪個人,徠法律用語裏向望起扣搭弗足相。" privacy_title: "隱私" - privacy_description: "我裏弗會畀爾個任何情報賣爻。我裏划算最後用招聘來得利,爾也放心,空是爾朆明确講肯,我裏弗會畀爾個私人情報賣畀有意個公司。" +# privacy_description_2: "We will not sell any of your personal information." security_title: "安全" security_description: "我裏儘話保證爾個個人隱私安全。當開源項目,管感爾都好檢查搭改進我裏自由開放個網站個安全。" email_title: "電子郵箱" @@ -903,12 +926,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio email_description_suffix: "要勿我裏發畀爾個信裏向有鏈接,爾随低2都好改偏向設定要勿取消訂閱。" cost_title: "花銷" cost_description: "目前來講,CodeCombat 是全個免費個!我裏個大目標之一也是保持目前箇種方式,讓越多越好個人攪功還好,弗管是弗是生活裏向。空把天黯落來,我裏嘸數會畀訂一許內容收費,不過我裏能可弗馨妝。運道好個話,我裏好開公司,通過:" - recruitment_title: "招兵買馬" - recruitment_description_prefix: "來 CodeCombat 搭,爾會變做一個法力高強個“巫師”,弗單單徠遊戲裏,來生活當中也是。" - url_hire_programmers: "嘸人招程序員有得快爻," - recruitment_description_suffix: "怪得只講爾手藝讚起爻咦經過爾同意,我裏會畀爾最好個編碼成果畀講萬個僱主望,希望渠裏眼紅。渠裏解眼功夫鈿畀我裏,薪水發畀爾," - recruitment_description_italic: "“一大袋”" - recruitment_description_ending: "。箇網站也佩好一直免費,兩門進。划算佩馨寧。" +# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "版權搭許可" contributor_title: "貢獻者許可協議" contributor_description_prefix: "所有對本網站要勿 GitHub 代碼庫個努力都照我裏個" From 83186064576bd351b61bb23d242b73cd199f7a09 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Thu, 4 Dec 2014 14:33:48 -0800 Subject: [PATCH 04/32] Added a slot for the wizard hand hero doll images. --- app/schemas/models/thang_type.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/schemas/models/thang_type.coffee b/app/schemas/models/thang_type.coffee index 3721e7705..e9434475e 100644 --- a/app/schemas/models/thang_type.coffee +++ b/app/schemas/models/thang_type.coffee @@ -137,6 +137,7 @@ _.extend ThangTypeSchema.properties, head: { type: 'string', format: 'image-file', title: 'Head' } hair: { type: 'string', format: 'image-file', title: 'Hair' } thumb: { type: 'string', format: 'image-file', title: 'Thumb' } + wizardHand: { type: 'string', format: 'image-file', title: 'Wizard Hand' } dollImages: c.object { title: 'Paper Doll Images' }, male: { type: 'string', format: 'image-file', title: ' Male' } female: { type: 'string', format: 'image-file', title: ' Female' } From 0306d0ee3187b7ec14ecbddca6c8927eaa8e841f Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Thu, 4 Dec 2014 15:04:34 -0800 Subject: [PATCH 05/32] Fixed bug with heroes not rendering in the hero picker. --- app/views/play/modal/PlayHeroesModal.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/play/modal/PlayHeroesModal.coffee b/app/views/play/modal/PlayHeroesModal.coffee index 6ceca7bcb..e8cc1a92a 100644 --- a/app/views/play/modal/PlayHeroesModal.coffee +++ b/app/views/play/modal/PlayHeroesModal.coffee @@ -148,7 +148,8 @@ module.exports = class PlayHeroesModal extends ModalView return hero fullHero = @getFullHero hero.get 'original' onLoaded = => - return unless canvas = $(".hero-item[data-hero-id='#{fullHero.get('original')}'] canvas") + canvas = $(".hero-item[data-hero-id='#{fullHero.get('original')}'] canvas") + return unless canvas.length # Don't render it if it's not on the screen. canvas.show().prop width: @canvasWidth, height: @canvasHeight builder = new SpriteBuilder(fullHero) movieClip = builder.buildMovieClip(fullHero.get('actions').attack?.animation ? fullHero.get('actions').idle.animation) From 55f85e368232a2b59687813f729991a904473f07 Mon Sep 17 00:00:00 2001 From: Zacharias Fisches Date: Fri, 5 Dec 2014 00:21:36 +0100 Subject: [PATCH 06/32] Added another tip to be displayed during loading There are only two kinds of people: those that can extrapolate from incomplete data... --- app/templates/play/level/level_loading.jade | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/play/level/level_loading.jade b/app/templates/play/level/level_loading.jade index ecae6f30c..0ef0f2afa 100644 --- a/app/templates/play/level/level_loading.jade +++ b/app/templates/play/level/level_loading.jade @@ -38,6 +38,7 @@ strong.tip.rare(data-i18n='play_level.tip_hofstadters_law') Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law. strong.tip.rare(data-i18n='play_level.tip_premature_optimization') Premature optimization is the root of all evil - Donald Knuth strong.tip.rare(data-i18n='play_level.tip_brute_force') When in doubt, use brute force. - Ken Thompson + strong.tip.rare(data-i18n='play_level.tip_extrapolation') There are only two kinds of people: those that can extrapolate from incomplete data... strong.tip.rare span(data-i18n='play_level.tip_harry') Yer a Wizard, span= me.get('name', true) From b5b38d042adf7c77c48e345e61c860c77db0c5d1 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Thu, 4 Dec 2014 15:35:31 -0800 Subject: [PATCH 07/32] Added i18n for extrapolation tip. --- app/locale/ar.coffee | 1 + app/locale/bg.coffee | 1 + app/locale/ca.coffee | 1 + app/locale/cs.coffee | 1 + app/locale/da.coffee | 1 + app/locale/de-AT.coffee | 1 + app/locale/de-CH.coffee | 1 + app/locale/de-DE.coffee | 1 + app/locale/el.coffee | 1 + app/locale/en-AU.coffee | 1 + app/locale/en-GB.coffee | 1 + app/locale/en-US.coffee | 1 + app/locale/en.coffee | 1 + app/locale/es-419.coffee | 1 + app/locale/es-ES.coffee | 1 + app/locale/fa.coffee | 1 + app/locale/fi.coffee | 1 + app/locale/fr.coffee | 1 + app/locale/gl.coffee | 1 + app/locale/he.coffee | 1 + app/locale/hi.coffee | 1 + app/locale/hu.coffee | 1 + app/locale/id.coffee | 1 + app/locale/it.coffee | 1 + app/locale/ja.coffee | 1 + app/locale/ko.coffee | 1 + app/locale/lt.coffee | 1 + app/locale/ms.coffee | 1 + app/locale/nb.coffee | 1 + app/locale/nl-BE.coffee | 1 + app/locale/nl-NL.coffee | 1 + app/locale/nn.coffee | 1 + app/locale/no.coffee | 1 + app/locale/pl.coffee | 1 + app/locale/pt-BR.coffee | 1 + app/locale/pt-PT.coffee | 1 + app/locale/ro.coffee | 1 + app/locale/ru.coffee | 5 +++-- app/locale/sk.coffee | 1 + app/locale/sl.coffee | 1 + app/locale/sr.coffee | 1 + app/locale/sv.coffee | 1 + app/locale/th.coffee | 1 + app/locale/tr.coffee | 1 + app/locale/uk.coffee | 1 + app/locale/ur.coffee | 1 + app/locale/vi.coffee | 1 + app/locale/zh-HANS.coffee | 1 + app/locale/zh-HANT.coffee | 1 + app/locale/zh-WUU-HANS.coffee | 1 + app/locale/zh-WUU-HANT.coffee | 1 + 51 files changed, 53 insertions(+), 2 deletions(-) diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee index e3e9a0caf..00b13df29 100644 --- a/app/locale/ar.coffee +++ b/app/locale/ar.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee index d3332d086..9784c59a2 100644 --- a/app/locale/bg.coffee +++ b/app/locale/bg.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "български език", englishDescri # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index 94f614363..c838b2a69 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # 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..." customize_wizard: "Personalitza el teu bruixot" game_menu: diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee index 2b3281da2..1b59c262f 100644 --- a/app/locale/cs.coffee +++ b/app/locale/cs.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # 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..." customize_wizard: "Upravit Kouzelníka" game_menu: diff --git a/app/locale/da.coffee b/app/locale/da.coffee index ed5ce5386..29131e1bf 100644 --- a/app/locale/da.coffee +++ b/app/locale/da.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # 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..." customize_wizard: "Tilpas troldmand" game_menu: diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee index 0087e1ea0..d34585229 100644 --- a/app/locale/de-AT.coffee +++ b/app/locale/de-AT.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # 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..." customize_wizard: "Bearbeite den Zauberer" game_menu: diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee index d2bd3ad7e..7b6b1451b 100644 --- a/app/locale/de-CH.coffee +++ b/app/locale/de-CH.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # 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..." customize_wizard: "Zauberer apasse" game_menu: diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index c16e3adee..0a3388ea5 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: tip_hofstadters_law: "Hofstadter's Gesetz: Es dauert immer länger als erwartet, auch wenn du Hofstadter's Gesetz anwendest." tip_premature_optimization: "Vorzeitige Optimierung ist die Wurzel allen Übels (oder mindestens des meisten) bei der Programmierung - Donald Knuth" tip_brute_force: "Verwende im Zweifelsfall rohe Gewalt. - Ken Thompson" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "Bearbeite den Zauberer" game_menu: diff --git a/app/locale/el.coffee b/app/locale/el.coffee index 3947e9500..1ed8c7f4a 100644 --- a/app/locale/el.coffee +++ b/app/locale/el.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # 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..." customize_wizard: "Προσαρμογή Μάγου" game_menu: diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee index d4492aa88..e49714380 100644 --- a/app/locale/en-AU.coffee +++ b/app/locale/en-AU.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee index d9ed831b1..57028b941 100644 --- a/app/locale/en-GB.coffee +++ b/app/locale/en-GB.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # 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..." customize_wizard: "Customise Wizard" # game_menu: diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee index eb1fb863c..b2d0a4bec 100644 --- a/app/locale/en-US.coffee +++ b/app/locale/en-US.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/en.coffee b/app/locale/en.coffee index e13714240..e7f15c8c5 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -296,6 +296,7 @@ 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..." customize_wizard: "Customize Wizard" game_menu: diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee index a415e6c9f..05054a66c 100644 --- a/app/locale/es-419.coffee +++ b/app/locale/es-419.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip tip_hofstadters_law: "Ley de Hofstadter: Siempre toma más tiempo del que esperas, inclso cuando tienes en cuenta la ley de Hofstadter." tip_premature_optimization: "La optimización prematura es la raíz de la maldad. - Donald Knuth" tip_brute_force: "Cuando tengas duda, usa la fuerza bruta. - Ken Thompson" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "Personalizar Hechicero" game_menu: diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee index 3a03d1d82..62ce99731 100644 --- a/app/locale/es-ES.coffee +++ b/app/locale/es-ES.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis # 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: "La optimizacion prematura es la raiz de todo mal. - Donald Knuth" tip_brute_force: "Cuando haya dudas, usa la fuerza bruta. - Ken Thompson" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "Personalizar Mago" game_menu: diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee index 5139f5a84..7de7917b8 100644 --- a/app/locale/fa.coffee +++ b/app/locale/fa.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee index b0fe0d705..5d474dca0 100644 --- a/app/locale/fi.coffee +++ b/app/locale/fi.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index 972aab0c2..f43a79559 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t tip_hofstadters_law: "Loi de Hofstadter: Il faut toujours plus de temps que prévu, même si vous prenez en compte la loi de Hofstadter." tip_premature_optimization: "L'optimisation prématurée est la racine de tous les maux. - Donald Knuth" tip_brute_force: "En cas de doute, utiliser la force brute. - Ken Thompson" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "Personnaliser le magicien" game_menu: diff --git a/app/locale/gl.coffee b/app/locale/gl.coffee index 85f86d333..b969cb6c6 100644 --- a/app/locale/gl.coffee +++ b/app/locale/gl.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr # 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: "A optimizacion prematura é a raíz de todo mal. - Donald Knuth" tip_brute_force: "Cando hai dúbidas, usa a forza bruta. - Ken Thompson" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "Persoalizar Mago" game_menu: diff --git a/app/locale/he.coffee b/app/locale/he.coffee index a4693e33c..dea375e6b 100644 --- a/app/locale/he.coffee +++ b/app/locale/he.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee index 7a1fbf1e4..a810e327c 100644 --- a/app/locale/hi.coffee +++ b/app/locale/hi.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee index f7e1a85fa..18afa2096 100644 --- a/app/locale/hu.coffee +++ b/app/locale/hu.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # 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..." customize_wizard: "Varázsló testreszabása" game_menu: diff --git a/app/locale/id.coffee b/app/locale/id.coffee index 6618d5b7a..896eb4f39 100644 --- a/app/locale/id.coffee +++ b/app/locale/id.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/it.coffee b/app/locale/it.coffee index c0ca2f6b1..fcffa53e8 100644 --- a/app/locale/it.coffee +++ b/app/locale/it.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # 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..." customize_wizard: "Personalizza il mago" game_menu: diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee index a47d573e4..a3e89d596 100644 --- a/app/locale/ja.coffee +++ b/app/locale/ja.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # 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..." customize_wizard: "魔法使いの設定" game_menu: diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index 619fc2875..c3e1b92fe 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # 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..." customize_wizard: "사용자 정의 마법사" game_menu: diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee index 1cc498d2e..dd4b93dc4 100644 --- a/app/locale/lt.coffee +++ b/app/locale/lt.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee index d94a7d2d7..7753985d6 100644 --- a/app/locale/ms.coffee +++ b/app/locale/ms.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee index ff0688d5f..39492f06a 100644 --- a/app/locale/nb.coffee +++ b/app/locale/nb.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg tip_hofstadters_law: "Hofstadters Lov: Ting tar alltid lenger tid enn du tror, selv når du tar Hofstadters Lov med i beregningen." # 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..." customize_wizard: "Tilpass Trollmann" game_menu: diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee index a78c4997b..34683351d 100644 --- a/app/locale/nl-BE.coffee +++ b/app/locale/nl-BE.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: # 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..." customize_wizard: "Pas Tovenaar aan" game_menu: diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index 01fbe4cef..cbab9b4c3 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription # 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..." customize_wizard: "Pas Tovenaar aan" game_menu: diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee index 47d5b45a0..d2710c50d 100644 --- a/app/locale/nn.coffee +++ b/app/locale/nn.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/no.coffee b/app/locale/no.coffee index 0be828d6f..1c332da56 100644 --- a/app/locale/no.coffee +++ b/app/locale/no.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # 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..." customize_wizard: "Tilpass trollmann" game_menu: diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee index 0608423e1..60d5e3fb5 100644 --- a/app/locale/pl.coffee +++ b/app/locale/pl.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish # 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..." customize_wizard: "Spersonalizuj czarodzieja" game_menu: diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee index bf8c18f41..986ab87aa 100644 --- a/app/locale/pt-BR.coffee +++ b/app/locale/pt-BR.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: tip_hofstadters_law: "Lei de Hofstadter: Sempre demora mais do que você espera, mesmo quando você leva em consideração a Lei de Hofstadter." tip_premature_optimization: "Uma otimização permatura é a raíz de todos os males. - Donald Knuth" tip_brute_force: "Na dúvida, utilize força bruta. - Ken Thompson" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "Personalize o feiticeiro" game_menu: diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index 7ed91940b..2b163f12a 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: tip_hofstadters_law: "Lei de Hofstadter: Tudo demora sempre mais do que pensas, mesmo quando levas em conta a Lei de Hofstadter." tip_premature_optimization: "Uma otimização permatura é a raíz de todo o mal. - Donald Knuth" tip_brute_force: "Quando em dúvida, usa a força bruta. - Ken Thompson" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "Personalizar Feiticeiro" game_menu: diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index 67cff3737..c2db60ea9 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman # 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..." customize_wizard: "Personalizează Wizard-ul" game_menu: diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 7756018fc..f356631c7 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi tip_hofstadters_law: "Закон Хофштадтера: Любое дело всегда длится дольше, чем ожидается, даже если учесть закон Хофштадтера." tip_premature_optimization: "Поспешная оптимизация - корень всех зол. - Donald Knuth" tip_brute_force: "Когда сомневаешься используй грубую силу. - Кен Томпсон" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "Настройки волшебника" game_menu: @@ -376,13 +377,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi blocks: "Блокирует" # As in "this shield blocks this much damage" skills: "Умения" available_for_purchase: "Доступно для покупки" - level_to_unlock: "Разблокируется на уровне:" # ToDo: check in interface + level_to_unlock: "Разблокируется на уровне:" restricted_to_certain_heroes: "Только определенные герои могут играть этот уровень." 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: "имя" # ToDo: check in interface + action_name: "имя" action_cooldown: "Применяется" action_specific_cooldown: "Восстановление" action_damage: "Повреждения" diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee index 6172439c4..69108f840 100644 --- a/app/locale/sk.coffee +++ b/app/locale/sk.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee index c6dbdc816..46fb45a39 100644 --- a/app/locale/sl.coffee +++ b/app/locale/sl.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee index 1aab0fdcf..da99b70eb 100644 --- a/app/locale/sr.coffee +++ b/app/locale/sr.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # 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..." customize_wizard: "Прилагоди Чаробњака" game_menu: diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee index e6737e009..f049ee2ef 100644 --- a/app/locale/sv.coffee +++ b/app/locale/sv.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr # 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..." customize_wizard: "Skräddarsy trollkarl" game_menu: diff --git a/app/locale/th.coffee b/app/locale/th.coffee index 96652cba4..6dcef569a 100644 --- a/app/locale/th.coffee +++ b/app/locale/th.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # 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..." # customize_wizard: "Customize Wizard" game_menu: diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee index cee9ae923..f01928092 100644 --- a/app/locale/tr.coffee +++ b/app/locale/tr.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # 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..." customize_wizard: "Sihirbazı Düzenle" game_menu: diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index 5de3e9a20..d5bd191fa 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "українська мова", englishDesc # 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..." customize_wizard: "Налаштування персонажа" game_menu: diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee index fe4a58ce2..bda5d5e9c 100644 --- a/app/locale/ur.coffee +++ b/app/locale/ur.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee index 1cc502633..25185e13e 100644 --- a/app/locale/vi.coffee +++ b/app/locale/vi.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # 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..." customize_wizard: "Tùy chỉnh Wizard" game_menu: diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index 8173dce3d..ec3058605 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese tip_hofstadters_law: "侯世达定律:做事所花费的时间总是比你预期的要长,即使你的预期中考虑了侯世达定律。" tip_premature_optimization: "过早的优化是万恶之源。 - 高德纳" tip_brute_force: "拿不准时就用穷举法。 - Ken Thompson" +# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." customize_wizard: "自定义向导" game_menu: diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index 057020f25..493124707 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # 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..." customize_wizard: "自定義巫師" game_menu: diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee index 325404d2b..d71e50457 100644 --- a/app/locale/zh-WUU-HANS.coffee +++ b/app/locale/zh-WUU-HANS.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # 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..." # customize_wizard: "Customize Wizard" # game_menu: diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee index e80869dc5..8c9b91c53 100644 --- a/app/locale/zh-WUU-HANT.coffee +++ b/app/locale/zh-WUU-HANT.coffee @@ -296,6 +296,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # 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..." customize_wizard: "自設定獻路人" game_menu: From 222e532006ee68cacfbdbe1fd2c277e54c984a2b Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Thu, 4 Dec 2014 16:04:44 -0800 Subject: [PATCH 08/32] Make default code locking contiguous MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Lock ‘del’ command too. --- app/views/play/level/tome/SpellView.coffee | 35 ++++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee index 0582b9fb8..fa5610bda 100644 --- a/app/views/play/level/tome/SpellView.coffee +++ b/app/views/play/level/tome/SpellView.coffee @@ -273,6 +273,15 @@ module.exports = class SpellView extends CocoView return true for range in @readOnlyRanges when leftRange.intersects(range) false + intersectsRight = => + rightRange = @ace.getSelectionRange().clone() + if rightRange.end.column < @aceDoc.getLine(rightRange.end.row).length + rightRange.setEnd rightRange.end.row, rightRange.end.column + 1 + else if rightRange.start.row < @aceDoc.getLength() - 1 + rightRange.setEnd rightRange.end.row + 1, 0 + return true for range in @readOnlyRanges when rightRange.intersects(range) + false + preventReadonly = (next) -> return true if intersects() next?() @@ -284,27 +293,10 @@ module.exports = class SpellView extends CocoView wrapper => orig.apply obj, args obj[method] - finishRange = (row, startRow, startColumn) => - range = new Range startRow, startColumn, row, @aceSession.getLine(row).length - 1 - range.start = @aceDoc.createAnchor range.start - range.end = @aceDoc.createAnchor range.end - range.end.$insertRight = true - @readOnlyRanges.push range - - # Create a read-only range for each chunk of text not separated by an empty line @readOnlyRanges = [] - startRow = startColumn = null - for row in [0...@aceSession.getLength()] - unless /^\s*$/.test @aceSession.getLine(row) - unless startRow? and startColumn? - startRow = row - startColumn = 0 - else - if startRow? and startColumn? - finishRange row - 1, startRow, startColumn - startRow = startColumn = null - if startRow? and startColumn? - finishRange @aceSession.getLength() - 1, startRow, startColumn + lines = @aceDoc.getAllLines() + lastRow = row for line, row in lines when not /^\s*$/.test(line) + @readOnlyRanges.push new Range 0, 0, lastRow, lines[lastRow].length - 1 if lastRow? # Override write operations that intersect with default code interceptCommand @ace, 'onPaste', preventReadonly @@ -319,6 +311,9 @@ module.exports = class SpellView extends CocoView if e.command.name in ['Backspace', 'throttle-backspaces'] and intersectsLeft() @zatanna?.off?() return false + if e.command.name is 'del' and intersectsRight() + @zatanna?.off?() + return false if e.command.name in ['enter-skip-delimiters', 'Enter', 'Return'] if intersects() e.editor.navigateDown 1 From 5aefd5ffa2f3db5861298ef9895b6f8917b02727 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Thu, 4 Dec 2014 16:33:17 -0800 Subject: [PATCH 09/32] I think the server needs to gzip now, and possibly only a bug is keeping it working. --- server_setup.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/server_setup.coffee b/server_setup.coffee index ad056068b..ae76032c2 100644 --- a/server_setup.coffee +++ b/server_setup.coffee @@ -56,7 +56,6 @@ setupExpressMiddleware = (app) -> express.logger.format('prod', productionLogging) app.use(express.logger('prod')) app.use express.compress filter: (req, res) -> - return false if req.headers.host is 'codecombat.com' # CloudFlare will gzip it for us on codecombat.com # But now it's disabled. compressible res.getHeader('Content-Type') else express.logger.format('dev', developmentLogging) From bd797e8cfd3f03ab217ab7e7bd7ebd4b5356e676 Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Thu, 4 Dec 2014 16:33:56 -0800 Subject: [PATCH 10/32] Highlight locked default code --- app/styles/play/level/tome/spell.sass | 3 +++ app/views/play/level/tome/SpellView.coffee | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/styles/play/level/tome/spell.sass b/app/styles/play/level/tome/spell.sass index b7d2b3169..964288585 100644 --- a/app/styles/play/level/tome/spell.sass +++ b/app/styles/play/level/tome/spell.sass @@ -107,6 +107,9 @@ .executed background-color: rgba(110, 110, 110, 0.12) + .locked-code + border: 1px dashed rgba(53, 45, 34, 0.5) + +keyframes(pulseRedBackground) from background-color: rgba(255, 45, 27, 0.4) diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee index fa5610bda..06d948f6d 100644 --- a/app/views/play/level/tome/SpellView.coffee +++ b/app/views/play/level/tome/SpellView.coffee @@ -293,10 +293,16 @@ module.exports = class SpellView extends CocoView wrapper => orig.apply obj, args obj[method] + if @lockedCodeMarkerID? + @aceSession.removeMarker @lockedCodeMarkerID + @lockedCodeMarkerID = null + @readOnlyRanges = [] lines = @aceDoc.getAllLines() lastRow = row for line, row in lines when not /^\s*$/.test(line) - @readOnlyRanges.push new Range 0, 0, lastRow, lines[lastRow].length - 1 if lastRow? + if lastRow? + @readOnlyRanges.push new Range 0, 0, lastRow, lines[lastRow].length - 1 + @lockedCodeMarkerID = @aceSession.addMarker @readOnlyRanges[0], 'locked-code', 'fullLine' # Override write operations that intersect with default code interceptCommand @ace, 'onPaste', preventReadonly From d0ee8cb7c7105e3af7c36f3ed12810bf1deb1b23 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Thu, 4 Dec 2014 17:41:17 -0800 Subject: [PATCH 11/32] Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided. --- app/schemas/models/user.coffee | 3 + server/payments/discount_handler.coffee | 48 ++++++++ server/payments/payment_handler.coffee | 49 ++++---- server/payments/subscription_handler.coffee | 78 ++++++------ server/users/user_handler.coffee | 20 +++ .../functional/discount_handler.spec.coffee | 114 ++++++++++++++++++ test/server/functional/payment.spec.coffee | 29 +++++ 7 files changed, 278 insertions(+), 63 deletions(-) create mode 100644 server/payments/discount_handler.coffee create mode 100644 test/server/functional/discount_handler.spec.coffee diff --git a/app/schemas/models/user.coffee b/app/schemas/models/user.coffee index 015145768..1d6396ac0 100644 --- a/app/schemas/models/user.coffee +++ b/app/schemas/models/user.coffee @@ -278,6 +278,9 @@ _.extend UserSchema.properties, planID: { enum: ['basic'] } subscriptionID: { type: 'string' } token: { type: 'string' } + couponID: { type: 'string' } + discountID: { type: 'string' } + free: { type: ['boolean', 'string'], format: 'date-time' } } c.extendBasicProperties UserSchema, 'user' diff --git a/server/payments/discount_handler.coffee b/server/payments/discount_handler.coffee new file mode 100644 index 000000000..64e865c94 --- /dev/null +++ b/server/payments/discount_handler.coffee @@ -0,0 +1,48 @@ +# Not paired with a document in the DB, just handles coordinating between +# the stripe property in the user with what's being stored in Stripe. + +Handler = require '../commons/Handler' +config = require '../../server_config' +stripe = require('stripe')(config.stripe.secretKey) + +class DiscountHandler extends Handler + logDiscountError: (req, msg) -> + console.warn "Discount Error: #{req.user.get('slug')} (#{req.user._id}): '#{msg}'" + + discountUser: (req, user, done) -> + if (not user) or user.isAnonymous() + return done({res: 'User must not be anonymous.', code: 403}) + + couponID = req.body.stripe.couponID + if not couponID + @logDiscountError(req, 'Missing couponID.') + return done({res: 'Missing couponID.', code: 422}) + + stripe.coupons.retrieve couponID, (err, coupon) => + if (err) + return done({res: 'No coupon with id '+couponID, code: 404}) + + if customerID = user.get('stripe')?.customerID + options = { coupon: coupon.id } + stripe.customers.update customerID, options, (err, customer) => + if err + @logDiscountError(req, 'Error applying coupon to customer'+customerID) + return done({res: 'Error applying coupon to customer.', code: 500}) + done() + + else + # couponID will be set on the user by the handler + done() + + removeDiscountFromCustomer: (req, user, done) -> + customerID = user.get('stripe').customerID + return done() unless customerID + + stripe.customers.deleteDiscount customerID, (err, customer) => + if err + console.log 'err?', err + @logDiscountError(req, 'Error removing coupon from customer ' + customerID) + return done({res: 'Error applying coupon to customer.', code: 500}) + done() + +module.exports = new DiscountHandler() \ No newline at end of file diff --git a/server/payments/payment_handler.coffee b/server/payments/payment_handler.coffee index f2e4f2bd4..cc077994b 100644 --- a/server/payments/payment_handler.coffee +++ b/server/payments/payment_handler.coffee @@ -166,29 +166,34 @@ PaymentHandler = class PaymentHandler extends Handler handleStripePaymentPost: (req, res, timestamp, productID, token) -> # First, make sure we save the payment info as a Customer object, if we haven't already. - if not req.user.get('stripe')?.customerID - stripe.customers.create({ - card: token - email: req.user.get('email') - metadata: { - id: req.user._id + '' - slug: req.user.get('slug') - } - }).then(((customer) => - stripeInfo = _.cloneDeep(req.user.get('stripe') ? {}) - stripeInfo.customerID = customer.id - req.user.set('stripe', stripeInfo) - req.user.save((err) => - if err - @logPaymentError(req, 'Stripe customer id save db error. '+err) - return @sendDatabaseError(res, err) + if token + customerID = req.user.get('stripe')?.customerID + + if customerID + # old customer, new token. Save it. + stripe.customers.update customerID, { card: token }, (err, customer) => @beginStripePayment(req, res, timestamp, productID) - ) - ), - (err) => - @logPaymentError(req, 'Stripe customer creation error. '+err) - return @sendDatabaseError(res, err) - ) + + else + newCustomer = { + card: token + email: req.user.get('email') + metadata: { id: req.user._id + '', slug: req.user.get('slug') } + } + + stripe.customers.create newCustomer, (err, customer) => + if err + @logPaymentError(req, 'Stripe customer creation error. '+err) + return @sendDatabaseError(res, err) + + stripeInfo = _.cloneDeep(req.user.get('stripe') ? {}) + stripeInfo.customerID = customer.id + req.user.set('stripe', stripeInfo) + req.user.save (err) => + if err + @logPaymentError(req, 'Stripe customer id save db error. '+err) + return @sendDatabaseError(res, err) + @beginStripePayment(req, res, timestamp, productID) else @beginStripePayment(req, res, timestamp, productID) diff --git a/server/payments/subscription_handler.coffee b/server/payments/subscription_handler.coffee index 231f059d4..f1d0531e5 100644 --- a/server/payments/subscription_handler.coffee +++ b/server/payments/subscription_handler.coffee @@ -4,6 +4,7 @@ Handler = require '../commons/Handler' config = require '../../server_config' stripe = require('stripe')(config.stripe.secretKey) +discountHandler = require './discount_handler' subscriptions = { basic: { @@ -19,61 +20,52 @@ class SubscriptionHandler extends Handler if (not req.user) or req.user.isAnonymous() return done({res: 'You must be signed in to subscribe.', code: 403}) - stripeToken = req.body.stripe?.token - extantCustomerID = user.get('stripe')?.customerID - if not (stripeToken or extantCustomerID) + token = req.body.stripe?.token + customerID = user.get('stripe')?.customerID + if not (token or customerID) @logSubscriptionError(req, 'Missing stripe token or customer ID.') return done({res: 'Missing stripe token or customer ID.', code: 422}) - if stripeToken - stripe.customers.create({ - card: stripeToken - email: req.user.get('email') - metadata: { - id: req.user._id + '' - slug: req.user.get('slug') + if token + if customerID + stripe.customers.update customerID, { card: token }, (err, customer) => + @checkForExistingSubscription(req, user, customer, done) + + else + newCustomer = { + card: token + email: req.user.get('email') + metadata: { id: req.user._id + '', slug: req.user.get('slug') } } - }).then(((customer) => + + stripe.customers.create newCustomer, (err, customer) => + if err + if err.type in ['StripeCardError', 'StripeInvalidRequestError'] + return done({res: 'Card error', code: 402}) + else + @logSubscriptionError(req, 'Stripe customer creation error. '+err) + return done({res: 'Database error.', code: 500}) + stripeInfo = _.cloneDeep(req.user.get('stripe') ? {}) stripeInfo.customerID = customer.id req.user.set('stripe', stripeInfo) - req.user.save((err) => + req.user.save (err) => if err @logSubscriptionError(req, 'Stripe customer id save db error. '+err) return done({res: 'Database error.', code: 500}) @checkForExistingSubscription(req, user, customer, done) - ) - ), - (err) => - if err.type in ['StripeCardError', 'StripeInvalidRequestError'] - done({res: 'Card error', code: 402}) - else - @logSubscriptionError(req, 'Stripe customer creation error. '+err) - return done({res: 'Database error.', code: 500}) - ) else - stripe.customers.retrieve(extantCustomerID, (err, customer) => + stripe.customers.retrieve(customerID, (err, customer) => if err @logSubscriptionError(req, 'Stripe customer creation error. '+err) return done({res: 'Database error.', code: 500}) - else if not customer - # TODO: what actually happens when you try to retrieve a customer and it DNE? - @logSubscriptionError(req, 'Stripe customer id is missing! '+err) - stripeInfo = _.cloneDeep(req.user.get('stripe') ? {}) - delete stripeInfo.customerID - req.user.set('stripe', stripeInfo) - req.user.save (err) => - if err - @logSubscriptionError(req, 'Stripe customer id delete db error. '+err) - return done({res: 'Database error.', code: 500}) - @subscribeUser(req, done) - else - @checkForExistingSubscription(req, user, customer, done) + @checkForExistingSubscription(req, user, customer, done) ) checkForExistingSubscription: (req, user, customer, done) -> + couponID = user.get('stripe')?.couponID if subscription = customer.subscriptions?.data?[0] if subscription.cancel_at_period_end @@ -87,30 +79,34 @@ class SubscriptionHandler extends Handler return done({res: 'Database error.', code: 500}) options = { plan: 'basic', trial_end: subscription.current_period_end } + options.coupon = couponID if couponID stripe.customers.update req.user.get('stripe').customerID, options, (err, customer) => if err @logSubscriptionError(req, 'Stripe customer plan setting error. '+err) return done({res: 'Database error.', code: 500}) - @updateUser(req, user, customer.subscriptions.data[0], false, done) + @updateUser(req, user, customer, false, done) else # can skip creating the subscription - return @updateUser(req, user, customer.subscriptions.data[0], false, done) + return @updateUser(req, user, customer, false, done) else - stripe.customers.update req.user.get('stripe').customerID, { plan: 'basic' }, (err, customer) => + options = { plan: 'basic' } + options.coupon = couponID if couponID + stripe.customers.update req.user.get('stripe').customerID, options, (err, customer) => if err @logSubscriptionError(req, 'Stripe customer plan setting error. '+err) return done({res: 'Database error.', code: 500}) - @updateUser(req, user, customer.subscriptions.data[0], true, done) + @updateUser(req, user, customer, true, done) - updateUser: (req, user, subscription, increment, done) -> + updateUser: (req, user, customer, increment, done) -> + subscription = customer.subscriptions.data[0] stripeInfo = _.cloneDeep(user.get('stripe') ? {}) stripeInfo.planID = 'basic' stripeInfo.subscriptionID = subscription.id - stripeInfo.customerID = subscription.customer + stripeInfo.customerID = customer.id req.body.stripe = stripeInfo # to make sure things work for admins, who are mad with power user.set('stripe', stripeInfo) diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee index 083b91ab4..c413d93da 100644 --- a/server/users/user_handler.coffee +++ b/server/users/user_handler.coffee @@ -12,6 +12,7 @@ moment = require 'moment' LevelSession = require '../levels/sessions/LevelSession' LevelSessionHandler = require '../levels/sessions/level_session_handler' SubscriptionHandler = require '../payments/subscription_handler' +DiscountHandler = require '../payments/discount_handler' EarnedAchievement = require '../achievements/EarnedAchievement' UserRemark = require './remarks/UserRemark' {isID} = require '../lib/utils' @@ -123,6 +124,25 @@ UserHandler = class UserHandler extends Handler return callback(err) if err return callback(null, req, user) ) + + # Discount setting + (req, user, callback) -> + return callback(null, req, user) unless req.user?.isAdmin() + hasCoupon = user.get('stripe')?.couponID + wantsCoupon = req.body.stripe?.couponID + + return callback(null, req, user) if hasCoupon is wantsCoupon + if wantsCoupon and (hasCoupon isnt wantsCoupon) + DiscountHandler.discountUser(req, user, (err) -> + return callback(err) if err + return callback(null, req, user) + ) + else if hasCoupon and not wantsCoupon + DiscountHandler.removeDiscountFromCustomer(req, user, (err) -> + return callback(err) if err + return callback(null, req, user) + ) + ] getById: (req, res, id) -> diff --git a/test/server/functional/discount_handler.spec.coffee b/test/server/functional/discount_handler.spec.coffee new file mode 100644 index 000000000..909b97f41 --- /dev/null +++ b/test/server/functional/discount_handler.spec.coffee @@ -0,0 +1,114 @@ + +config = require '../../../server_config' +require '../common' + +# sample data that comes in through the webhook when you subscribe + + +describe '/db/user, editing stripe.couponID property', -> + + stripe = require('stripe')(config.stripe.secretKey) + userURL = getURL('/db/user') + webhookURL = getURL('/stripe/webhook') + + it 'clears the db first', (done) -> + clearModels [User, Payment], (err) -> + throw err if err + done() + + #- shared data between tests + joeData = null + firstSubscriptionID = null + + it 'does not work for non-admins', (done) -> + loginJoe (joe) -> + joeData = joe.toObject() + expect(joeData.stripe).toBeUndefined() + joeData.stripe = { couponID: '20pct' } + request.put {uri: userURL, json: joeData }, (err, res, body) -> + expect(res.statusCode).toBe(200) # fails silently + expect(res.body.stripe).toBeUndefined() # but still fails + done() + + it 'does not work with invalid coupons', (done) -> + loginAdmin (admin) -> + joeData.stripe = { couponID: 'DNE' } + request.put {uri: userURL, json: joeData }, (err, res, body) -> + expect(res.statusCode).toBe(404) + done() + + it 'sets the couponID on a user without an existing stripe object', (done) -> + joeData.stripe = { couponID: '20pct' } + request.put {uri: userURL, json: joeData }, (err, res, body) -> + joeData = body + expect(res.statusCode).toBe(200) + expect(body.stripe.couponID).toBe('20pct') + done() + + it 'just updates the couponID when it changes and there is no existing subscription', (done) -> + joeData.stripe.couponID = '500off' + request.put {uri: userURL, json: joeData }, (err, res, body) -> + expect(res.statusCode).toBe(200) + expect(body.stripe.couponID).toBe('500off') + done() + + it 'removes the couponID from the user when the admin makes it so', (done) -> + delete joeData.stripe.couponID + request.put {uri: userURL, json: joeData }, (err, res, body) -> + joeData = body + expect(res.statusCode).toBe(200) + expect(body.stripe).toBeUndefined() + done() + + it 'puts the coupon back', (done) -> + joeData.stripe = {couponID: '500off'} + request.put {uri: userURL, json: joeData }, (err, res, body) -> + expect(res.statusCode).toBe(200) + expect(body.stripe.couponID).toBe('500off') + done() + + it 'applies a discount to the newly created customer when a plan is set', (done) -> + stripe.tokens.create { + card: { number: '4242424242424242', exp_month: 12, exp_year: 2020, cvc: '123' } + }, (err, token) -> + stripeTokenID = token.id + loginJoe (joe) -> + joeData.stripe.token = stripeTokenID + joeData.stripe.planID = 'basic' + request.put {uri: userURL, json: joeData }, (err, res, body) -> + joeData = body + expect(res.statusCode).toBe(200) + stripe.customers.retrieve joeData.stripe.customerID, (err, customer) -> + expect(customer.discount).toBeDefined() + expect(customer.discount.coupon.id).toBe('500off') + done() + + + it 'updates the discount on the customer when an admin changes the couponID', (done) -> + loginAdmin (admin) -> + joeData.stripe.couponID = '20pct' + request.put {uri: userURL, json: joeData }, (err, res, body) -> + expect(res.statusCode).toBe(200) + expect(body.stripe.couponID).toBe('20pct') + stripe.customers.retrieve joeData.stripe.customerID, (err, customer) -> + expect(customer.discount.coupon.id).toBe('20pct') + done() + + it 'removes discounts from the customer when an admin removes the couponID', (done) -> + delete joeData.stripe.couponID + request.put {uri: userURL, json: joeData }, (err, res, body) -> + expect(res.statusCode).toBe(200) + expect(body.stripe.couponID).toBeUndefined() + stripe.customers.retrieve joeData.stripe.customerID, (err, customer) -> + expect(customer.discount).toBe(null) + done() + + it 'adds a discount to the customer when an admin adds the couponID', (done) -> + joeData.stripe.couponID = '20pct' + request.put {uri: userURL, json: joeData }, (err, res, body) -> + expect(res.statusCode).toBe(200) + expect(body.stripe.couponID).toBe('20pct') + stripe.customers.retrieve joeData.stripe.customerID, (err, customer) -> + expect(customer.discount.coupon.id).toBe('20pct') + done() + diff --git a/test/server/functional/payment.spec.coffee b/test/server/functional/payment.spec.coffee index 26cb4cb44..f8fb257cf 100644 --- a/test/server/functional/payment.spec.coffee +++ b/test/server/functional/payment.spec.coffee @@ -82,6 +82,7 @@ describe '/db/payment', -> joeID = null timestamp = new Date().getTime() stripeTokenID = null + joeData = null it 'clears the db first', (done) -> clearModels [User, Payment], (err) -> @@ -131,6 +132,34 @@ describe '/db/payment', -> done() ) ) + + it 'allows a new charge on the existing customer', (done) -> + data = { productID: 'gems_5', stripe: { timestamp: new Date().getTime() } } + request.post {uri: paymentURL, json: data }, (err, res, body) -> + expect(res.statusCode).toBe 201 + Payment.count {}, (err, count) -> + expect(count).toBe(2) + User.findById joeID, (err, user) -> + joeData = user.toObject() + expect(user.get('purchased').gems).toBe(10000) + done() + + it "updates the customer's card when you submit a new token", (done) -> + stripe.customers.retrieve joeData.stripe.customerID, (err, customer) -> + originalCustomerID = customer.id + originalCardID = customer.cards.data[0].id + stripe.tokens.create { + card: { number: '4242424242424242', exp_month: 12, exp_year: 2020, cvc: '123' } + }, (err, token) -> + data = { productID: 'gems_5', stripe: { timestamp: new Date().getTime(), token: token.id } } + request.post {uri: paymentURL, json: data }, (err, res, body) -> + expect(res.statusCode).toBe(201) + User.findById joeID, (err, user) -> + joeData = user.toObject() + expect(joeData.stripe.customerID).toBe(originalCustomerID) + stripe.customers.retrieve joeData.stripe.customerID, (err, customer) -> + expect(customer.cards.data[0].id).not.toBe(originalCardID) + done() it 'clears the db', (done) -> clearModels [User, Payment], (err) -> From 4616df6c238c288b13aed0dda9e03ff670389308 Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Thu, 4 Dec 2014 21:14:22 -0800 Subject: [PATCH 12/32] Add virtual page views for subscribe paths --- app/views/account/PaymentsView.coffee | 1 + app/views/play/WorldMapView.coffee | 4 ++++ app/views/play/level/LevelLoadingView.coffee | 1 + app/views/play/modal/SubscribeModal.coffee | 3 +++ 4 files changed, 9 insertions(+) diff --git a/app/views/account/PaymentsView.coffee b/app/views/account/PaymentsView.coffee index 8ec4d888e..931b825a9 100644 --- a/app/views/account/PaymentsView.coffee +++ b/app/views/account/PaymentsView.coffee @@ -30,6 +30,7 @@ module.exports = class PaymentsView extends RootView onClickStartSubscription: (e) -> @openModalView new SubscribeModal() window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'payments view' + window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics'] onSubscribed: -> document.location.reload() diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index 7afe43cad..90e8b05e2 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -124,6 +124,7 @@ module.exports = class WorldMapView extends RootView @openModalView? new modal() unless window.currentModal if modal is SubscribeModal window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'world map loadded' + window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics'] , 2000 onSubscribed: -> @@ -214,6 +215,7 @@ module.exports = class WorldMapView extends RootView @openModalView new modal() if modal is SubscribeModal window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'map level clicked' + window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics'] else if $(e.target).attr('disabled') Backbone.Mediator.publish 'router:navigate', route: '/contribute/adventurer' return @@ -222,11 +224,13 @@ module.exports = class WorldMapView extends RootView else @startLevel levelElement window.tracker?.trackEvent 'Clicked Level', category: 'World Map', levelID: levelID, ['Google Analytics'] + window.tracker?.trackPageView "world-map/clicked-level/#{levelID}", ['Google Analytics'] onClickStartLevel: (e) -> levelElement = $(e.target).parents('.level-info-container') @startLevel levelElement window.tracker?.trackEvent 'Clicked Start Level', category: 'World Map', levelID: levelElement.data('level-id'), ['Google Analytics'] + window.tracker?.trackPageView "world-map/clicked-start-level/#{levelElement.data('level-id')}", ['Google Analytics'] startLevel: (levelElement) -> @setupManager?.destroy() diff --git a/app/views/play/level/LevelLoadingView.coffee b/app/views/play/level/LevelLoadingView.coffee index 04955721f..99d8150ca 100644 --- a/app/views/play/level/LevelLoadingView.coffee +++ b/app/views/play/level/LevelLoadingView.coffee @@ -114,6 +114,7 @@ module.exports = class LevelLoadingView extends CocoView @openModalView new modal() if modal is SubscribeModal window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'level loading' + window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics'] onSubscribed: -> document.location.reload() diff --git a/app/views/play/modal/SubscribeModal.coffee b/app/views/play/modal/SubscribeModal.coffee index 59b34338b..cc8af4bb7 100644 --- a/app/views/play/modal/SubscribeModal.coffee +++ b/app/views/play/modal/SubscribeModal.coffee @@ -45,10 +45,12 @@ module.exports = class SubscribeModal extends ModalView container: @$el ).on 'shown.bs.popover', => application.tracker?.trackEvent 'Subscription parent hover', {} + application.tracker?.trackPageView "subscription/parent-hover", ['Google Analytics'] onClickPurchaseButton: (e) -> @playSound 'menu-button-click' application.tracker?.trackEvent 'Started subscription purchase', {} + application.tracker?.trackPageView "subscription/start-purchase", ['Google Analytics'] stripeHandler.open({ description: $.i18n.t('subscribe.stripe_description') amount: @product.amount @@ -69,6 +71,7 @@ module.exports = class SubscribeModal extends ModalView onSubscriptionSuccess: -> application.tracker?.trackEvent 'Finished subscription purchase', {} + application.tracker?.trackPageView "subscription/finish-purchase", ['Google Analytics'] Backbone.Mediator.publish 'subscribe-modal:subscribed', {} @playSound 'victory' @hide() From e4120ceadf61ffa3afab03f0e75a1c8e15aa1e93 Mon Sep 17 00:00:00 2001 From: Lirai Date: Fri, 5 Dec 2014 10:43:41 +0100 Subject: [PATCH 13/32] Update de-DE.coffee some translations --- app/locale/de-DE.coffee | 70 ++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index 0a3388ea5..d4b136051 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -4,15 +4,15 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: no_ie: "CodeCombat läuft nicht im IE8 oder älteren Browsern. Tut uns Leid!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat ist nicht für Mobilgeräte optimiert und funktioniert möglicherweise nicht." # Warning that shows up on mobile devices play: "Spielen" # The big play button that just starts playing a level -# try_it: "Try It" # Alternate wording for Play button + try_it: "Versuchs mal" # Alternate wording for Play button old_browser: "Oh! Dein Browser ist zu alt für CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Du kannst es trotzdem versuchen, aber es wird wahrscheinlich nicht funktionieren." -# 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: "Schlechte Nachricht: CodeCombat funktioniert nicht im iPad browser. Gute Nachricht: unsere eigene iPad app wartet nur noch auf die genehmigung durch Apple." campaign: "Kampagne" for_beginners: "Für Anfänger" multiplayer: "Mehrspieler" # Not currently shown on home page for_developers: "Für Entwickler" # Not currently shown on home page. -# or_ipad: "Or download for iPad" + or_ipad: "Oder lade es fürs iPad herunter" nav: play: "Spielen" # The top nav bar entry where players choose which levels to play @@ -58,7 +58,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: confirm: "Bestätigen" owned: "im Besitz" # For items you own locked: "Gesperrt" -# purchasable: "Purchasable" # For a hero you unlocked but haven't purchased + purchasable: "Käuflich" # For a hero you unlocked but haven't purchased available: "Verfügbar" skills_granted: "Verfügbare Fähigkeiten" # Property documentation details heroes: "Helden" # Tooltip on hero shop button from /play @@ -71,9 +71,9 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: buy_gems: "Edelsteine kaufen" campaign_forest: "Forest Kampagne" campaign_dungeon: "Dungeon Kampagne" -# subscription_required: "Subscription Required" -# free: "Free" -# subscribed: "Subscribed" + subscription_required: "Abonnement benötigt" + free: "Kostenlos" + subscribed: "Abonniert" older_campaigns: "Ältere Kampagne" anonymous: "Anonymer Spieler" level_difficulty: "Schwierigkeit: " @@ -296,7 +296,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: tip_hofstadters_law: "Hofstadter's Gesetz: Es dauert immer länger als erwartet, auch wenn du Hofstadter's Gesetz anwendest." tip_premature_optimization: "Vorzeitige Optimierung ist die Wurzel allen Übels (oder mindestens des meisten) bei der Programmierung - Donald Knuth" tip_brute_force: "Verwende im Zweifelsfall rohe Gewalt. - Ken Thompson" -# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." + tip_extrapolation: "Es gibt nur zwei Sorten Menschen, diejenigen die aus unvollständigen Informationen Schlüsse ziehen können, ..." customize_wizard: "Bearbeite den Zauberer" game_menu: @@ -337,20 +337,20 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: prompt_body: "Benötigst du mehr?" prompt_button: "Laden betreten" -# subscribe: -# subscribe_title: "Subscribe" -# levels: "Unlock 25 levels! With 5 new ones every week!" -# heroes: "More powerful heroes!" -# gems: "3500 bonus gems every month!" -# items: "Over 250 bonus items!" -# parents: "For Parents" -# parents_title: "Your child will learn to code." -# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." -# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." -# subscribe_button: "Subscribe Now" -# stripe_description: "Monthly Subscription" -# subscription_required_to_play: "You'll need a subscription to play this level." + subscribe: + subscribe_title: "Abonnieren" + levels: "25 weitere level! Und 5 neue jede Woche!" + heroes: "Stärkere Helden!" + gems: "3500 bonus Edelsteine jeden Monat!" + items: "Über 250 bonus Gegenstände!" + parents: "Für Eltern" + parents_title: "Dein Kind lernt zu programmieren." + parents_blurb1: "Mit CodeCombat, lernt dein Kind richtige Programme zu schreiben. Es fängt mit einfachen Befehlen an, und schreitet ganz unmerklich zu schwierigeren Themen fort." + parents_blurb2: "Für 9.99 im Monat, bekommt es jede Woche neue Herausforderungen sowie persönlichen email support von professionellen Programmierern." + parents_blurb3: "Kein Risiko: 100% Geld zurück Garantie, und 1-Klick Abokündigung." + subscribe_button: "Abonniere jetzt" + stripe_description: "Monatsabo" + subscription_required_to_play: "Leider musst du ein Abo haben um dieses Level spielen zu können." choose_hero: choose_hero: "Wähle deinen Helden" @@ -620,16 +620,16 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: new_thang_title_login: "Melde dich an um einen neuen Thang-Typen zu erstellen" new_level_title_login: "Melde dich an um ein neues Level zu erstellen" new_achievement_title: "Erstelle ein neues Achievement" - new_achievement_title_login: "Melde dich an um ein neues Achievement zu erstellen" + new_achievement_title_login: "Melde dich an um einen neuen Erfolg zu erstellen" article_search_title: "Durchsuche Artikel hier" thang_search_title: "Durchsuche Thang-Typen hier" level_search_title: "Durchsuche Levels hier" - achievement_search_title: "Durchsuche Achievements" + achievement_search_title: "Durchsuche Erfolge" read_only_warning2: "Warnung: Du kannst hier keine Änderungen speichern, weil du nicht angemeldet bist." - no_achievements: "Es wurden noch keine Achievements zu diesem Level hinzugefügt." -# achievement_query_misc: "Key achievement off of miscellanea" -# achievement_query_goals: "Key achievement off of level goals" -# level_completion: "Level Completion" + no_achievements: "Es wurden noch keine Erfolge zu diesem Level hinzugefügt." + achievement_query_misc: "Sonstige Schlüsselerfolge" + achievement_query_goals: "Level Erfolge" + level_completion: "abgeschlossene Level" # pop_i18n: "Populate I18N" article: @@ -640,19 +640,19 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: page_title: "Mitwirken" character_classes_title: "Charakter Klassen" introduction_desc_intro: "Wir haben hohe Erwartungen für CodeCombat." -# introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, " - introduction_desc_github_url: "CodeCombat ist komplett OpenSource" -# introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." + introduction_desc_pref: "Wir wollen ein Ort sein, an dem sich Programmierer aller coleur treffen, um gemeinsam zu spielen und zu lernen. Wo sie andere in die wunderbare Welt des Programmierens einführen, und dabei die besten Aspekte der Programmierer-Community verkörpern. Wir können und wollen dies nicht alleine tun. Projekte wie GitHub, Stack Overflow and Linux leben von den großartigen Leuten die sie bauen und nutzen. Darum ist, " + introduction_desc_github_url: "CodeCombat komplett OpenSource" + introduction_desc_suf: ". Wir wollen es dir so einfach und vielfältig wie irgend möglich machen, dich an diesem Projekt zu beteiligen. Damit es genauso zu deinem Projekt wird, wie zu unserem." introduction_desc_ending: "Wir hoffen du nimmst an unserer Party teil!" introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" alert_account_message_intro: "Hey du!" alert_account_message: "Um Klassen-Emails abonnieren zu können, musst du dich zuerst anmelden." -# archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." -# archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever." + archmage_summary: "Magst du an den Spielegrafiken mitgestalten? Am User Interface Design, Datenbank- und Server Organisation, Mehrspieler Netzwerk. Oder doch lieber helfen die Physics-, Sound, oder Spieleengine zu optimieren? Möchtest du helfen ein Spiel zu programmieren, mit dem andere das lernen worin du schon gut bist? Es gibt viel zu tun, und wenn du ein erfahrener Programmierer bist, und an CodeCombat mitentwickeln willst, dann ist dies deine Klasse. Wir freuen uns auf dich, wenn wir gemeinsam das beste Programmierspiel aller Zeiten erstellen." + archmage_introduction: "Mit das Beste am Spiele schreiben ist, das man so viele unterschiedliche Dinge zusammen bringen muß. Graphik, Sound, Real-Time Networking, Soziales Miteinander, und natürlich viele der eher alltäglichen Aspekte des Programmierens. Vom einfachen Datenbank-Management, und der Server Administration, über user interface Design und Realisierung. Es ist viel zu tun, und wenn du ein erfahrener Programmierer bist, mit einem Interesse wirklich tief in die wesentlichen details von CodeCombat abzutauchen, dann könnte dies deine Klasse sein. Deine Hilf ist gefragt, wenn wir gemeinsam das beste Programmierspiel aller Zeiten schreiben." class_attributes: "Klassenattribute" archmage_attribute_1_pref: "Kentnisse in " -# archmage_attribute_1_suf: ", or a desire to learn. Most of our code is in this language. If you're a fan of Ruby or Python, you'll feel right at home. It's JavaScript, but with a nicer syntax." -# archmage_attribute_2: "Some experience in programming and personal initiative. We'll help you get oriented, but we can't spend much time training you." + archmage_attribute_1_suf: ", oder ein intensiver Lernwille. Der größte Teil unseres Codes ist in dieser Sprache geschrieben. Wenn du bereits mit Ruby oder Python vertraut bist, wirst du dich gleich zu hause fühlen. Es ist wie JavaScript, aber mit einer angenehmeren Syntax." + archmage_attribute_2: "Vorhandene Erfahrung im Programmieren, und wichtig, Eigeninitiative. Wir werden dir helfen dich zurecht zu finden, aber wir haben leider nicht die Zeit dich intensiv anzulernen." # how_to_join: "How To Join" join_desc_1: "Jeder kann mithelfen! Schau dir unseren " join_desc_2: "um anzufangen, und hake die Checkbox unten an um dich als mutiger Erzmagier einzutragen und über die neuesten Nachrichten per Email zu erhalten. Möchtest du dich darüber unterhalten was zu tun ist oder wie du dich besser beteiligen kannst? " From 5703e3eb9443aa4c21f4d96d9040c5f41d3e34c1 Mon Sep 17 00:00:00 2001 From: nixel2007 Date: Fri, 5 Dec 2014 17:42:19 +0300 Subject: [PATCH 14/32] ru Play block --- app/locale/ru.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index f356631c7..cd3b0bfa5 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -71,9 +71,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi buy_gems: "Купить самоцветы" campaign_forest: "Лесная кампания" campaign_dungeon: "Кампания в подземелье" -# subscription_required: "Subscription Required" -# free: "Free" -# subscribed: "Subscribed" + subscription_required: "Требуется подписка" + free: "Бесплатно" + subscribed: "Подписан" older_campaigns: "Старые кампании" anonymous: "Неизвестный игрок" level_difficulty: "Сложность: " From ef20e26484457bd4ed552242b56e5417a33ce1e8 Mon Sep 17 00:00:00 2001 From: nixel2007 Date: Fri, 5 Dec 2014 18:00:14 +0300 Subject: [PATCH 15/32] ru subscribe block and strings above. --- app/locale/ru.coffee | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index cd3b0bfa5..baa79e4eb 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -4,7 +4,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi no_ie: "CodeCombat не работает в IE8 или более старых версиях. Нам очень жаль!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat не приспособлен для работы на мобильных устройствах и может не работать!" # Warning that shows up on mobile devices play: "Играть" # The big play button that just starts playing a level -# try_it: "Try It" # Alternate wording for Play button + try_it: "Попробуй!" # Alternate wording for Play button old_browser: "Ой, ваш браузер слишком стар для запуска CodeCombat. Извините!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Вы всё равно можете попробовать, но, скорее всего, это не будет работать." ipad_browser: "Плохие новости: CodeCombat не запускается в браузере IPad. Хорошие новости: наше нативное приложение для IPad ожидает одобрения от Apple." @@ -105,7 +105,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi authenticate_gplus: "Войти через G+" load_profile: "Загрузить профиль G+" load_email: "Загрузить G+ почту" -# finishing: "Finishing" + finishing: "Завершение" signup: create_account_title: "Создать аккаунт, чтобы сохранить прогресс" @@ -296,7 +296,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi tip_hofstadters_law: "Закон Хофштадтера: Любое дело всегда длится дольше, чем ожидается, даже если учесть закон Хофштадтера." tip_premature_optimization: "Поспешная оптимизация - корень всех зол. - Donald Knuth" tip_brute_force: "Когда сомневаешься используй грубую силу. - Кен Томпсон" -# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." + tip_extrapolation: "Есть два типа людей: те, кто могут экстраполировать неполные данные..." customize_wizard: "Настройки волшебника" game_menu: @@ -337,20 +337,20 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi prompt_body: "Хотите еще?" prompt_button: "Войти в магазин" -# subscribe: -# subscribe_title: "Subscribe" -# levels: "Unlock 25 levels! With 5 new ones every week!" -# heroes: "More powerful heroes!" -# gems: "3500 bonus gems every month!" -# items: "Over 250 bonus items!" -# parents: "For Parents" -# parents_title: "Your child will learn to code." -# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." -# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." -# subscribe_button: "Subscribe Now" -# stripe_description: "Monthly Subscription" -# subscription_required_to_play: "You'll need a subscription to play this level." + subscribe: + subscribe_title: "Подпишись" + levels: "Разблокируй 25 уровней!. И еще 5 каждую неделю!" + heroes: "Более сильные герои!" + gems: "3500 бонусных самоцветов каждый месяц!" + items: "Более 250 бонусных предметов!" + parents: "Для Родителей" + parents_title: "Ваш ребенок научиться программировать." + parents_blurb1: "С CodeCombat ваш ребенок учится через написание реального кода. Начиная с изучения простых команд, продолжая более продвинутыми темами." + parents_blurb2: "За $9.99/месяц они получат новые испытания каждую неделю и персональную поддержку профессиональных программистов через электронную почту." + parents_blurb3: "Без риска: 100% гарантия возрата денег, возможность отписаться в 1 клик." + subscribe_button: "Подпишись сейчас" + stripe_description: "Месячная подписка" + subscription_required_to_play: "Чтобы сыграть этот уровень нужна подписка." choose_hero: choose_hero: "Выберите героя" From ecc94b411c5069c3a4945a2191e10268aaedef05 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 15:29:18 +0000 Subject: [PATCH 16/32] Update en.coffee --- app/locale/en.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index e7f15c8c5..18743a50c 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -346,7 +346,7 @@ parents: "For Parents" parents_title: "Your child will learn to code." parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." - parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." + parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." subscribe_button: "Subscribe Now" stripe_description: "Monthly Subscription" From 203b407b4b8b4deaf66fe04d3f6201a4a6e7e7eb Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 15:38:41 +0000 Subject: [PATCH 17/32] Update en.coffee --- app/locale/en.coffee | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 18743a50c..43866a8a3 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -908,8 +908,7 @@ legal: page_title: "Legal" - opensource_intro: "CodeCombat is free to play and completely open source." - opensource_intro_2: "CodeCombat completely open source." + opensource_intro: "CodeCombat is completely open source." opensource_description_prefix: "Check out " github_url: "our GitHub" opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ practices_title: "Respectful Best Practices" practices_description: "These are our promises to you, the player, in slightly less legalese." privacy_title: "Privacy" - privacy_description_2: "We will not sell any of your personal information." + privacy_description: "We will not sell any of your personal information." security_title: "Security" security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." email_title: "Email" From 7cd8a57d1e0b016b9c458d684a5d64afbf51b9ee Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 15:38:42 +0000 Subject: [PATCH 18/32] Update legal.jade --- app/templates/legal.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/legal.jade b/app/templates/legal.jade index 4e5147c65..526b01ed4 100644 --- a/app/templates/legal.jade +++ b/app/templates/legal.jade @@ -7,7 +7,7 @@ block content hr - p(data-i18n="legal.opensource_intro_2").lead + p(data-i18n="legal.opensource_intro").lead | CodeCombat is completely open source. p span(data-i18n="legal.opensource_description_prefix") @@ -32,7 +32,7 @@ block content | These are our promises to you, the player, in slightly less legalese. h4(data-i18n="legal.privacy_title") | Privacy - p(data-i18n="legal.privacy_description_2") + p(data-i18n="legal.privacy_description") | We will not sell any of your personal information. h4(data-i18n="legal.security_title") | Security From afbc669742c5f4d82c87d29e6914a11dabe11506 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 15:41:31 +0000 Subject: [PATCH 19/32] Update en.coffee --- app/locale/en.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 43866a8a3..077551c6c 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -926,7 +926,7 @@ email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." cost_title: "Cost" cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" - cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." + cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights and Licenses" contributor_title: "Contributor License Agreement" contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" From e4be3198750da4cc0a12b303db3cb21dc1bce15f Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 15:43:37 +0000 Subject: [PATCH 20/32] Update legal.jade --- app/templates/legal.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/legal.jade b/app/templates/legal.jade index 526b01ed4..8199dee60 100644 --- a/app/templates/legal.jade +++ b/app/templates/legal.jade @@ -54,7 +54,7 @@ block content | you can change your preferences and easily unsubscribe at any time. h4(data-i18n="legal.cost_title") | Cost - p(data-i18n="legal.cost_description_2") + p(data-i18n="legal.cost_description") | CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee. h2(data-i18n="legal.copyrights_title") From f089531aac5b603aacb12110746e5c7ebdec7cc8 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 15:43:54 +0000 Subject: [PATCH 21/32] Update en.coffee --- app/locale/en.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 077551c6c..3d2c72a16 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -925,8 +925,7 @@ email_settings_url: "your email settings" email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." cost_title: "Cost" - cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" - cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." + cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights and Licenses" contributor_title: "Contributor License Agreement" contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" From bf7872b059764f8ac0976e4300aa13bf2dc52225 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 15:54:35 +0000 Subject: [PATCH 22/32] Update legal.jade --- app/templates/legal.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/legal.jade b/app/templates/legal.jade index 8199dee60..dbe22d46a 100644 --- a/app/templates/legal.jade +++ b/app/templates/legal.jade @@ -55,7 +55,7 @@ block content h4(data-i18n="legal.cost_title") | Cost p(data-i18n="legal.cost_description") - | CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee. + | CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee. h2(data-i18n="legal.copyrights_title") | Copyrights and Licenses From 8b62b6ec4417402ad9e345edb55c839707d6ffd1 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Fri, 5 Dec 2014 07:55:17 -0800 Subject: [PATCH 23/32] Temporary workaround for #1842. --- app/views/play/level/tome/SpellView.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee index 06d948f6d..cf1486b22 100644 --- a/app/views/play/level/tome/SpellView.coffee +++ b/app/views/play/level/tome/SpellView.coffee @@ -257,6 +257,7 @@ module.exports = class SpellView extends CocoView # TODO: Lock default indent for an empty line? return unless LevelOptions[@options.level.get('slug')]?.lockDefaultCode or CampaignOptions?.getOption?(@options?.level?.get?('slug'), 'lockDefaultCode') return unless @spell.source is @spell.originalSource or force + return if @spell.language in ['javascript', 'lua', 'clojure', 'io'] # Only works for languages without closing delimeters on blocks currently console.info 'Locking down default code.' From 171d862fcf61a84d434a95d8e04ebff826314155 Mon Sep 17 00:00:00 2001 From: nixel2007 Date: Fri, 5 Dec 2014 20:07:50 +0300 Subject: [PATCH 24/32] ru community block, skill_docs done, small fixes --- app/locale/ru.coffee | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index baa79e4eb..af84ca763 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -318,7 +318,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi choose_inventory: "Выбрать предметы" equipped_item: "Выбранный" available_item: "Доступно" - restricted_title: "Ограниченный" + restricted_title: "Ограничено" should_equip: "(двойной клик чтобы надеть)" equipped: "(выбранный)" locked: "(заблокированный)" @@ -339,7 +339,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi subscribe: subscribe_title: "Подпишись" - levels: "Разблокируй 25 уровней!. И еще 5 каждую неделю!" + levels: "Разблокируйте 25 уровней! И еще 5 каждую неделю!" heroes: "Более сильные герои!" gems: "3500 бонусных самоцветов каждый месяц!" items: "Более 250 бонусных предметов!" @@ -381,8 +381,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi restricted_to_certain_heroes: "Только определенные герои могут играть этот уровень." skill_docs: -# writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this -# read_only: "read-only" + writable: "доступно для записи" # Hover over "attack" in Your Skills while playing a level to see most of this + read_only: "только чтение" action_name: "имя" action_cooldown: "Применяется" action_specific_cooldown: "Восстановление" @@ -525,8 +525,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi skip_scripts: "Пропустить все возможные скрипты." toggle_playback: "Переключить проигрывание/паузу." scrub_playback: "Перемотка назад и вперед во времени." - single_scrub_playback: "Scrub back and forward through time by a single frame." - scrub_execution: "Scrub through current spell execution." + single_scrub_playback: "Покадровая перемотка назад и вперед." + scrub_execution: "Перескочить через выполнение текущего заклинания." toggle_debug: "Включить отображение отладки." toggle_grid: "Включить наложение сетки." toggle_pathfinding: "Включить путевой оверлей.." @@ -536,21 +536,21 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi community: main_title: "Сообщество CodeCombat" -# 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" + introduction: "Просмотрите ниже способы втянуться и решите, что для вас звучит наиболее весело и интересно. Мы с нетерпением ожидаем совместной работы с вами!" + level_editor_prefix: "Используйте" + level_editor_suffix: "CodeCombat чтобы создавать и редактировать уровни. Пользователи могут создавать уровни для своих одноклассников, друзей, хакатонов, студентов, братьев и сестер. Если создание нового уровня звучит устрашающе, вы можете начать, ответвившись от одного из наших!" + thang_editor_prefix: "Мы называем единицы внутри игры 'предметами'. Используйте" + thang_editor_suffix: "чтобы изменять ресурсы игры. Позволяйте единицам бросать снаряды, измените направление анимации, очки здоровья или загрузите свои собственные векторные изображения." + article_editor_prefix: "Увдели ошибку в нашей документации? Хотите сделать инструкции к вашим творениям? Посмотрите" + article_editor_suffix: "и помогите игрокам CodeCombat получить максимум от их времяпрепровождения." + find_us: "Найдите нас на этих сайтах" + social_blog: "Читайте блог CodeCombat на Sett" + social_discource: "Присоединяйтесь к обсуждению на нашем форуме" + social_facebook: "Оцените CodeCombat на Facebook" + social_twitter: "Следуйте за CodeCombat на Twitter" + social_gplus: "Присоединяйтесь к CodeCombat на Google+" + social_hipchat: "Общайтесь с нами в публичной чат-комнате CodeCombat на HipChat" + contribute_to_the_project: "Сотрудничайте с проектом" classes: archmage_title: "Архимаг" @@ -630,7 +630,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # 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" + pop_i18n: "Популяризируйте I18N" article: edit_btn_preview: "Предпросмотр" From fb4646b1dd86b07856cf2312daeb74b94683ad41 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Fri, 5 Dec 2014 09:08:26 -0800 Subject: [PATCH 25/32] Propagated i18n. --- app/locale/ar.coffee | 10 ++++------ app/locale/bg.coffee | 10 ++++------ app/locale/ca.coffee | 10 ++++------ app/locale/cs.coffee | 6 ++---- app/locale/da.coffee | 10 ++++------ app/locale/de-AT.coffee | 6 ++---- app/locale/de-CH.coffee | 6 ++---- app/locale/de-DE.coffee | 4 +--- app/locale/el.coffee | 10 ++++------ app/locale/en-AU.coffee | 10 ++++------ app/locale/en-GB.coffee | 10 ++++------ app/locale/en-US.coffee | 10 ++++------ app/locale/es-419.coffee | 10 ++++------ app/locale/es-ES.coffee | 6 ++---- app/locale/fa.coffee | 10 ++++------ app/locale/fi.coffee | 10 ++++------ app/locale/fr.coffee | 6 ++---- app/locale/gl.coffee | 6 ++---- app/locale/he.coffee | 10 ++++------ app/locale/hi.coffee | 10 ++++------ app/locale/hu.coffee | 10 ++++------ app/locale/id.coffee | 10 ++++------ app/locale/it.coffee | 6 ++---- app/locale/ja.coffee | 10 ++++------ app/locale/ko.coffee | 8 +++----- app/locale/lt.coffee | 10 ++++------ app/locale/ms.coffee | 6 ++---- app/locale/nb.coffee | 6 ++---- app/locale/nl-BE.coffee | 6 ++---- app/locale/nl-NL.coffee | 6 ++---- app/locale/nn.coffee | 10 ++++------ app/locale/no.coffee | 10 ++++------ app/locale/pl.coffee | 6 ++---- app/locale/pt-BR.coffee | 6 ++---- app/locale/pt-PT.coffee | 8 +++----- app/locale/ro.coffee | 6 ++---- app/locale/ru.coffee | 6 ++---- app/locale/sk.coffee | 10 ++++------ app/locale/sl.coffee | 10 ++++------ app/locale/sr.coffee | 10 ++++------ app/locale/sv.coffee | 6 ++---- app/locale/th.coffee | 10 ++++------ app/locale/tr.coffee | 6 ++---- app/locale/uk.coffee | 6 ++---- app/locale/ur.coffee | 10 ++++------ app/locale/vi.coffee | 10 ++++------ app/locale/zh-HANS.coffee | 6 ++---- app/locale/zh-HANT.coffee | 10 ++++------ app/locale/zh-WUU-HANS.coffee | 10 ++++------ app/locale/zh-WUU-HANT.coffee | 6 ++---- 50 files changed, 155 insertions(+), 255 deletions(-) diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee index 00b13df29..e80d4c286 100644 --- a/app/locale/ar.coffee +++ b/app/locale/ar.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee index 9784c59a2..6dd49ca3d 100644 --- a/app/locale/bg.coffee +++ b/app/locale/bg.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "български език", englishDescri # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "български език", englishDescri # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "български език", englishDescri # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "български език", englishDescri # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index c838b2a69..b3bba642c 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr legal: page_title: "Legalitat" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." privacy_title: "Privacitat" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Seguretat" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee index 1b59c262f..a570cfca1 100644 --- a/app/locale/cs.coffee +++ b/app/locale/cs.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr legal: page_title: "Licence" opensource_intro: "CodeCombat je zdarma a plně open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Podívejte se na " github_url: "naši stránku na GitHubu" opensource_description_center: "a pokud se vám chce, můžete i pomoct! CodeCombat je vystavěn na několika oblíbených svobodných projektech. Podívejte se na" @@ -918,7 +917,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr practices_title: "Doporučené postupy" practices_description: "Toto je příslib našeho přístupu v jednoduchém jazyce." privacy_title: "Soukromí" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Zabezpečení" security_description: "Usilujeme o to, abychom udrželi vaše osobní informace v bezpečí. Jako otevřený projekt jsme přístupni komukoliv k provedení kontroly kódu pro zlepšení našich bezpečnostních systémů." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr email_description_suffix: "nebo skrze odkazy v odeslaných emailech si můžete nastavit nebo se kdykoliv odhlásit z naší korespondence." cost_title: "Cena" cost_description: "Momentálně je CodeCombat 100% zdarma! Naší snahou je udržet přístup zdarma, abychom dali možnost hrát co největšímu množství lidí. V případě nutnosti budeme muset přejít na placený vstup nebo platbu za přístup k určitému obsahu, ale raději bychom se tomu vyhnuli. S trochou štěstí doufáme v následující plán monetizace:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights a Licence" contributor_title: "Licenční ujednání přispívatelů (CLA)" contributor_description_prefix: "Všichni přispívatelé jak na webu tak do projektu na GitHubu spadají pod naše " diff --git a/app/locale/da.coffee b/app/locale/da.coffee index 29131e1bf..6059d750a 100644 --- a/app/locale/da.coffee +++ b/app/locale/da.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee index d34585229..c6a0ae68f 100644 --- a/app/locale/de-AT.coffee +++ b/app/locale/de-AT.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: legal: page_title: "Rechtliches" opensource_intro: "CodeCombat ist Free-to-Play und vollständig Open Source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Schau dir " github_url: "unsere GitHub-Seite" opensource_description_center: " an und mach mit wenn Du möchtest! CodeCombat baut auf duzenden Open Source Projekten auf, und wir lieben sie. Schau dir die Liste in " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: practices_title: "Best Practices" practices_description: "Dies sind unsere Versprechen an dich, den Spieler, in weniger Fachchinesisch." privacy_title: "Datenschutz" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Datensicherheit" security_description: "Wir streben an, deine persönlichen Daten sicher zu verwahren. Als Open Source Projekt ist unsere Site frei zugänglich für jedermann, auch um unsere Sicherheitsmaßnahmen in Augenschein zu nehmen und zu verbessern." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: email_description_suffix: "oder durch von uns gesendete Links kannst du jederzeit deine Einstellungen ändern und Abonnements kündigen." cost_title: "Kosten" cost_description: "CodeCombat ist zur Zeit 100% kostenlos! Eines unserer Hauptziele ist, es dabei zu belassen, so dass es so viele Leute wie möglich spielen können, unabhängig davon in welcher Lebenssituation sie sich befinden. Falls dunkle Wolken aufziehen, könnten wir manche Inhalte im Rahmen eines Abonnements anbieten, aber lieber nicht. Mit etwas Glück können wir die Firma erhalten durch:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights und Lizenzen" contributor_title: "Contributor License Agreement" contributor_description_prefix: "Alle Beiträge, sowohl auf unserer Webseite als auch in unserem GitHub Repository, unterliegen unserer" diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee index 7b6b1451b..2616a1a9b 100644 --- a/app/locale/de-CH.coffee +++ b/app/locale/de-CH.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge legal: page_title: "Rechtlichs" opensource_intro: "CodeCombat isch free to play und komplett Open Source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Lueg dir " github_url: "üsi GitHub Siite" opensource_description_center: "ah und hilf mit, wennd magsch! CodeCombat isch uf dutzendi Open Source Projekt ufbaut und mir liebed sie. Lueg i " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge practices_title: "Respektvolli bewährti Praxis" practices_description: "Das sind üsi Verspreche a dich, de Spieler, in bitz weniger Fachchinesisch." privacy_title: "Dateschutz" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Sicherheit" security_description: "Mir bemühed üs, dini persönliche Informatione sicher ufzbewahre. Als es Open Source Projekt isch üsi Siite offe für jede, wo gern möcht üsi Security System besichtige und verbessere." email_title: "E-Mail" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge email_description_suffix: "oder dur d Links i de E-Mails wo mir schicked, chasch du jederziit dini Preferänze ändere und dich ganz eifach us de Mailing-Liste neh." cost_title: "Chöste" cost_description: "Im Moment isch CodeCombat 100% gratis! Eis vo üsne Hauptziel isch, dass das so bliibt, damit so viel Lüüt wie möglich chönd spiele, egal wo sie sich im Lebe befinded. Sötted dunkli Wolke am Horizont ufzieh chas sii, dass mir müed en Teil vom Inhalt chostepflichtig mache, aber es isch üs lieber, wenn da nid passiert. Mit chli Glück werded mir fähig sii, s Unternehme ufrecht z erhalte und zwor mit:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index d4b136051..a122e00bf 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: legal: page_title: "Rechtliches" opensource_intro: "CodeCombat ist Free-to-Play und vollständig Open Source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Schau dir " github_url: "unsere GitHub-Seite" opensource_description_center: " an und mach mit wenn Du möchtest! CodeCombat baut auf duzenden Open Source Projekten auf, und wir lieben sie. Schau dir die Liste in " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: practices_title: "Best Practices" practices_description: "Dies sind unsere Versprechen an dich, den Spieler, in weniger Fachchinesisch." privacy_title: "Datenschutz" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Datensicherheit" security_description: "Wir streben an, deine persönlichen Daten sicher zu verwahren. Als Open Source Projekt ist unsere Site frei zugänglich für jedermann, auch um unsere Sicherheitsmaßnahmen in Augenschein zu nehmen und zu verbessern." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: email_description_suffix: "oder durch von uns gesendete Links kannst du jederzeit deine Einstellungen ändern und Abonnements kündigen." cost_title: "Kosten" cost_description: "CodeCombat ist zur Zeit 100% kostenlos! Eines unserer Hauptziele ist, es dabei zu belassen, so dass es so viele Leute wie möglich spielen können, unabhängig davon in welcher Lebenssituation sie sich befinden. Falls dunkle Wolken aufziehen, könnten wir manche Inhalte im Rahmen eines Abonnements anbieten, aber lieber nicht. Mit etwas Glück können wir die Firma erhalten durch:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights und Lizenzen" contributor_title: "Contributor License Agreement" contributor_description_prefix: "Alle Beiträge, sowohl auf unserer Webseite als auch in unserem GitHub Repository, unterliegen unserer" diff --git a/app/locale/el.coffee b/app/locale/el.coffee index 1ed8c7f4a..1819d5410 100644 --- a/app/locale/el.coffee +++ b/app/locale/el.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee index e49714380..666548988 100644 --- a/app/locale/en-AU.coffee +++ b/app/locale/en-AU.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee index 57028b941..f78a102b2 100644 --- a/app/locale/en-GB.coffee +++ b/app/locale/en-GB.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights and Licences" contributor_title: "Contributor Licence Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee index b2d0a4bec..9f87185f0 100644 --- a/app/locale/en-US.coffee +++ b/app/locale/en-US.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee index 05054a66c..3e63650ac 100644 --- a/app/locale/es-419.coffee +++ b/app/locale/es-419.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee index 62ce99731..98d44cfcb 100644 --- a/app/locale/es-ES.coffee +++ b/app/locale/es-ES.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis legal: page_title: "Legal" opensource_intro: "CodeCombat es gratis y totalmente open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Echa un vistazo a " github_url: "nuestro GitHub" opensource_description_center: "y ayúdanos si quieres. CodeCombat está desarrollado sobre docenas de proyectos open source, y nos encantana. Mira " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis practices_title: "Prácticas respetuosas" practices_description: "Esto es lo que te prometemos a ti, el jugador, sin usar mucha jerga legal." privacy_title: "Privacidad" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Seguridad" security_description: "Nos esforzamos por mantener segura tu información personal. Como proyecto de código abierto, nuestro sitio está abierto a cualquiera que quiera revisarlo y mejorar nuestros sistemas de seguridad." email_title: "Correo electrónico" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis email_description_suffix: "o a través de los enlaces en los correos que te enviemos, puedes cambiar tus preferencias y darte de baja fácilmente en cualquier momento." cost_title: "Precio" cost_description: "Actualmente, ¡CodeCombat es 100% gratis! Uno de nuestros principales objetivos es mantenerlo así, de forma que el mayor número posible de gente pueda jugar, independientemente de sus posibilidades económicas. Si las cosas se tuercen, quizás tengamos que cobrar suscripciones o por algún contenido, pero preferimos no hacerlo. Con un poco de suerte, podremos mantener la empresa con: " -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights y Licencias" contributor_title: "Acuerdo de Licencia del Colaborador" contributor_description_prefix: "Todas las colaboraciones, tanto en la web como en nuestro repositorio de GitHub, están sujetas a nuestro" diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee index 7de7917b8..c76880f8f 100644 --- a/app/locale/fa.coffee +++ b/app/locale/fa.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee index 5d474dca0..df81e4460 100644 --- a/app/locale/fi.coffee +++ b/app/locale/fi.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index f43a79559..9667ba55f 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t legal: page_title: "Légal" opensource_intro: "CodeCombat est complètement gratuit et open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Regardez " github_url: "notre GitHub" opensource_description_center: "et aidez nous si vous voulez! CodeCombat est construit sur plusieurs projets open source, et nous les aimons. Regardez " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t practices_title: "Bonnes pratiques" practices_description: "Ce sont les promesses que nous vous faisons à vous, le joueur, en jargon un peu juridique." privacy_title: "Vie privée" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Sécurité" security_description: "Nous faisons tout notre possible pour conserver la confidentialité de vos informations personnelles. En tant que projet open source, notre site est ouvert à tous ceux qui souhaitent examiner et améliorer nos systèmes de sécurité." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t email_description_suffix: "ou avec des liens disponibles dans nos emails, vous pouvez changer vos préférences ou vous désinscrire à tout moment." cost_title: "Coût" cost_description: "Pour l'instant, CodeCombat est gratuit à 100%! Un de nos principaux objectifs est que ça le reste, pour qu'autant de gens possible puissent y jouer, indépendamment de leur niveau de vie. Si le ciel s'assombrit, nous devrons peut-être rendre les inscriptions payantes ou une partie du contenu, mais nous ne le souhaitons pas. Avec un peu de chance, nous serons capables de soutenir l'entreprise avec :" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights et Licences" contributor_title: "Contributor License Agreement" contributor_description_prefix: "Toute contribution, sur le site et sur le répertoire GitHub, est sujette à nos" diff --git a/app/locale/gl.coffee b/app/locale/gl.coffee index b969cb6c6..0c561413f 100644 --- a/app/locale/gl.coffee +++ b/app/locale/gl.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr legal: page_title: "Legal" opensource_intro: "CodeCombat é de balde e totalmente código aberto." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Bota un ollo a " github_url: "o noso GitHub" opensource_description_center: "e axúdanos si queres. CodeCombat está desenvolvido sobre ducias de proxectos de código aberto, e estamos encantados. Mira " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr practices_title: "Prácticas respetuosas" practices_description: "Esto é o que che propoñemos a ti, o xogador, sin usar moita terminoloxía legal." privacy_title: "Privacidade" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Seguridade" security_description: "Esforzamonos por manter segura a túa información persoal. Como proxecto de código aberto, o noso sitio está aberto a calqueira que queira revisalo e mellorar nosos sistemas de seguridade." email_title: "Correo electrónico" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr email_description_suffix: "ou a través das ligazóns nos correos que che enviemos, podes cambiar as túas preferencias e darte de baixa de xeito doado en calquera momento." cost_title: "Prezo" cost_description: "Actualmente, CodeCombat é 100% de balde! Un dos nosos principais obxectivos é mantenlo así, de forma que o maior número posible de xente poida xogar, independientemente das súass posibilidades económicas. Si as cousas se torcen, quizais teñamos que cobrar suscripcións por algún contido, pero preferimos non facelo. Cun pouco de sorte, poderemos manter a empresa con: " -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights e Licenzas" contributor_title: "Acordo de Licenza do Colaborador" contributor_description_prefix: "Todas as colaboracións, tanto na web como no noso repositorio de GitHub, están suxeitas ao noso" diff --git a/app/locale/he.coffee b/app/locale/he.coffee index dea375e6b..1670fc3bd 100644 --- a/app/locale/he.coffee +++ b/app/locale/he.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee index a810e327c..898b089b2 100644 --- a/app/locale/hi.coffee +++ b/app/locale/hi.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee index 18afa2096..dc3e93b7b 100644 --- a/app/locale/hu.coffee +++ b/app/locale/hu.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/id.coffee b/app/locale/id.coffee index 896eb4f39..439100a7b 100644 --- a/app/locale/id.coffee +++ b/app/locale/id.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/it.coffee b/app/locale/it.coffee index fcffa53e8..94ec57ab5 100644 --- a/app/locale/it.coffee +++ b/app/locale/it.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t legal: page_title: "Questioni legali" opensource_intro: "CodeCombat è gratuito da giocare e totalmente open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Visita il " github_url: "nostro GitHub" opensource_description_center: "e aiutaci se vuoi! CodeCombat è fatto di molti progetti open-source, e a noi piacciono tutti. Vedi " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t practices_title: "Buone pratiche di rispetto" practices_description: "Queste sono le promesse che ti facciamo, come giocatore, in linguaggio un po' meno legale." privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Sicurezza" security_description: "Facciamo tutto il possibile per tenere sicure le tue informazioni. Essendo un progetto open source, il nostro sito è aperto liberamente a chiunque per controllare e migliorare i nostri sistemi di sicurezza." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t email_description_suffix: "o con i link contenuti nei messaggi puoi cambiare le tue preferenze o cancellarti facilmente in qualsiasi momento." cost_title: "Costi" cost_description: "In questo momento CodeCombat è totalmente gratis! Uno dei nostri obiettivi principali è di mantenerlo così, in modo che più persone possibile ci possano giocare, in qualsiasi condizione. Se le cose si mettessero male, potremmo essere costretti a far pagare l'iscrizione ad alcuni contenuti; ma preferiremmo di no. In ogni caso saremo in grado di sostenere la ditta con:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Diritti e licenze" contributor_title: "Accordo di licenza per i contributori (CLA)" contributor_description_prefix: "Tutti i contributi, qui sul sito e sul deposito GitHub, sono soggetti al nostro" diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee index a3e89d596..514f63ae8 100644 --- a/app/locale/ja.coffee +++ b/app/locale/ja.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index c3e1b92fe..bb1e828b0 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t legal: # page_title: "Legal" opensource_intro: "코드 컴뱃은 무료이며 전적으로 오픈 소스를 기반으로 합니다." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "코드 컴뱃의" github_url: "GitHub" opensource_description_center: "를 확인해보세요. 그리고 원하신다면 함께 도와주세요! 코드 컴뱃은 수천 개의 오픈 소스 프로젝트를 기반으로 만들어졌고 저희는 이들에 대해 깊은 애정을 갖고 있습니다. 한번 " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." privacy_title: "프라이버시" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." email_title: "이메일" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t email_settings_url: "이메일 설정" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee index dd4b93dc4..a73cc3380 100644 --- a/app/locale/lt.coffee +++ b/app/locale/lt.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee index 7753985d6..24736292d 100644 --- a/app/locale/ms.coffee +++ b/app/locale/ms.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa legal: page_title: "Undang-Undang" opensource_intro: "CodeCombat adalah percuma untuk bermain dan adalah open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Sila lihat " github_url: "GitHub kami" opensource_description_center: "dan sumbang seberapa mampu! CodeCombat dibina atas beberapa projek open source, dan kami menyukainya. Sila lihat " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" cost_description: "Buat masa ini, CodeCombat adalah 100% percuma! salah satu daripada tujuan kami adalah untuk membiarkan ia sebegitu, supaya ramai boleh bermain, di mana sahaja mereka berada. Jikalau langit menjadi gelap untuk kami, kami akan mengecaj untuk langganan atau untuk beberapa muatan, tapi kami lebih suka untuk tidak berbuat demikian. Jika kami bernasib baik, kami dapat menanggung syarikat kami dengan:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Hakcipta dan Pemelesenan" contributor_title: "Persetujuan Lesen Penyumbang" contributor_description_prefix: "Kesemua sumbangan, termasuk di dalam laman dan di dalam repositiri GitHub, tertakluk kepada" diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee index 39492f06a..7c7ffda7c 100644 --- a/app/locale/nb.coffee +++ b/app/locale/nb.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg legal: page_title: "Juridisk" opensource_intro: "CodeCombat er gratis å spille og helt åpen kildekode." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Ta en titt på siden vår på " github_url: "GitHub" opensource_description_center: "og hjelp gjerne til hvis du har lyst! CodeCombat er basert på dusinvis av åpen kildekode-prosjekter og vi er veldig glade i dem. Se " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg practices_title: "Respektfulle \"Best Practices\"" practices_description: "Dette er våre løfter til deg som spiller, på litt mindre juridisk språk." privacy_title: "Personvern" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Sikkerhet" security_description: "Vi gjør alt vi kan for å beskytte dine personlige opplysninger. Som et åpen kildekode-prosjekt kan hvem som helst inspisere og forbedre sikkerhetssystemene våre." email_title: "Epost" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg email_description_suffix: "eller via linker i epostene vi sender til deg, kan du endre hvilke eposter du ønsker å motta og enkelt avslutte abonnementet når som helst." cost_title: "Pris" cost_description: "For øyeblikket er CodeCombat 100% gratis! Et av hovedmålene våre er å fortsette med det, sånn at flest mulig kan spille, uavhengig av livssituasjon. Hvis ting går dårlig må vi kanskje begynne å ta betalt for abonnement eller annet innhold, men vi vil helst slippe. Med litt flaks vil vi klare å holde selskapet i live med:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Kopirettigheter og lisenser" contributor_title: "Lisensavtale for bidragsytere" contributor_description_prefix: "Alle bidrag, både gjort gjennom brukergrensesnittet og i kodelageret på GitHub, er underlagt vår" diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee index 34683351d..67063d307 100644 --- a/app/locale/nl-BE.coffee +++ b/app/locale/nl-BE.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: legal: page_title: "Legaal" opensource_intro: "CodeCombat is gratis en volledig open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Bekijk " github_url: "onze GitHub" opensource_description_center: "en help ons als je wil! CodeCombat is gebouwd met de hulp van tientallen open source projecten, en wij zijn er gek op. Bekijk ook " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: practices_title: "Goede Respectvolle gewoonten" practices_description: "Dit zijn onze beloften aan u, de speler, in een iets minder juridische jargon." privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Beveiliging" security_description: "We streven ernaar om jouw persoonlijke informatie veilig te bewaren. Onze website is open en beschikbaar voor iedereen, opdat ons beveiliging systeem kan worden nagekeken en geoptimaliseerd door iedereen die dat wil. Dit alles is mogelijk doordat we volledig open source en transparant zijn." email_title: "E-mail" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: email_description_suffix: "of via urls in de emails die wij verzenden, kan je jouw instellingen wijzigen en ten allen tijden uitschrijven." cost_title: "Kosten" cost_description: "Momenteel is CodeCombat 100% gratis! Één van onze doestellingen is om dit zo te houden, opdat zoveel mogelijk mensen kunnen spelen, onafhankelijk van waar je leeft of wie je bent. Als het financieel moeilijker wordt, kan het mogelijk zijn dat we gaan beginnen met abonnementen of een prijs zetten op bepaalde zaken, maar we streven ernaar om dit te voorkomen. Met een beetje geluk zullen we dit voor altijd kunnen garanderen met:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Auteursrechten en licenties" contributor_title: "Licentieovereenkomst voor vrijwilligers" contributor_description_prefix: "Alle bijdragen, zowel op de website als op onze GitHub repository, vallen onder onze" diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index cbab9b4c3..104d56e0c 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription legal: page_title: "Legaal" opensource_intro: "CodeCombat is gratis en volledig open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Bekijk " github_url: "onze GitHub" opensource_description_center: "en help ons als je wil! CodeCombat is gebouwd met de hulp van tientallen open source projecten, en wij zijn er gek op. Bekijk ook " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription practices_title: "Goede Respectvolle gewoonten" practices_description: "Dit zijn onze beloften aan u, de speler, in een iets minder juridische jargon." privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Beveiliging" security_description: "We streven ernaar om jouw persoonlijke informatie veilig te bewaren. Onze website is open en beschikbaar voor iedereen, opdat ons beveiliging systeem kan worden nagekeken en geoptimaliseerd door iedereen die dat wil. Dit alles is mogelijk doordat we volledig open source en transparant zijn." email_title: "E-mail" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription email_description_suffix: "of via urls in de emails die wij verzenden, kan je jouw instellingen wijzigen en ten allen tijden uitschrijven." cost_title: "Kosten" cost_description: "Momenteel is CodeCombat 100% gratis! Één van onze doestellingen is om dit zo te houden, opdat zoveel mogelijk mensen kunnen spelen, onafhankelijk van waar je leeft of wie je bent. Als het financieel moeilijker wordt, kan het mogelijk zijn dat we gaan beginnen met abonnementen of een prijs zetten op bepaalde zaken, maar we streven ernaar om dit te voorkomen. Met een beetje geluk zullen we dit voor altijd kunnen garanderen met:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Auteursrechten en licenties" contributor_title: "Licentieovereenkomst voor vrijwilligers" contributor_description_prefix: "Alle bijdragen, zowel op de website als op onze GitHub repository, vallen onder onze" diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee index d2710c50d..3488503be 100644 --- a/app/locale/nn.coffee +++ b/app/locale/nn.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/no.coffee b/app/locale/no.coffee index 1c332da56..6a79e1f40 100644 --- a/app/locale/no.coffee +++ b/app/locale/no.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee index 60d5e3fb5..03a3ce9f5 100644 --- a/app/locale/pl.coffee +++ b/app/locale/pl.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish legal: page_title: "Nota prawna" opensource_intro: "CodeCombat jest całkowicie darmowe i całkowicie open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Zajrzyj na " github_url: "nasz GitHub" opensource_description_center: "i pomóż, jeśli tylko masz ochotę! CodeCombat bazuje na dziesiątkach projektów open source - kochamy je wszystkie. Wpadnij na " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish practices_title: "Ludzkim językiem" practices_description: "Oto nasze obietnice wobec ciebie, gracza, wyrażone po polsku, bez prawniczego żargonu." privacy_title: "Prywatność" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Bezpieczeństwo" security_description: "Z całych sił staramy się zabezpieczyć twoje prywatne informacje. Jako że jesteśmy projektem open source, każdy może sprawdzić i ulepszyć nasz system zabezpieczeń." email_title: "E-mail" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish email_description_suffix: "lub poprzez linki w e-mailach, które wysyłamy, możesz zmienić swoje ustawienia i w prosty sposób wypisać się z subskrypcji w dowolnym momencie." cost_title: "Koszty" cost_description: "W tym momencie CodeCombat jest w stu procentach darmowe! Jednym z naszych głównych celów jest, by utrzymać taki stan rzeczy, aby jak najwięcej ludzi miało dostęp do gry, bez względu na ich zasobność. Jeśli nadejdą gorsze dni, dopuszczamy możliwość wprowadzenia płatnych subskrypcji lub pobierania opłat za część zawartości, ale wolelibyśmy, by tak się nie stało. Przy odrobinie szczęścia, uda nam się podtrzymać obecną sytuację dzięki:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Prawa autorskie i licencje" contributor_title: "Umowa licencyjna dla współtwórców (CLA)" contributor_description_prefix: "Wszyscy współtwórcy, zarówno ci ze strony jak i ci z GitHuba, podlegają naszemu" diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee index 986ab87aa..6e1cb1cca 100644 --- a/app/locale/pt-BR.coffee +++ b/app/locale/pt-BR.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: legal: page_title: "Jurídico" opensource_intro: "CodeCombat é grátis para jogar e de código completamente aberto." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Confira " github_url: "nosso GitHub" opensource_description_center: "e ajude-nos se você gostar! CodeCombat é construído a partir de dúzias de projetos de código aberto, e nós amamos eles. Veja " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: practices_title: "Respeitáveis Boas Práticas" practices_description: "Essas são nossas promessas para você, o jogador, de uma maneira menos jurídica." privacy_title: "Privacidade" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Segurança" security_description: "Nós lutamos para manter suas informações pessoais a salvo.Como um projeto de código aberto, nosso site é aberto para qualquer um rever e melhorar nossos sistemas de segurança." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: email_description_suffix: "ou através de links nos emails que enviarmos, você pode trocar as preferências e facilmente se desinscrever a qualquer hora." cost_title: "Custo" cost_description: "Atualmente o CodeCombat é 100% grátis. Um dos nossos principais objetivos é mantê-lo dessa forma, para que, o maior número possível de pessoas possa jogar, independente de seu lugar na vida. Se o céu escurecer, nós poderemos ter que cobrar uma assinatura, ou por algum conteúdo, mas preferimos que não. Com alguma sorte, nós seremos capazes de manter a empresa com:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Direitos Autorais e Licenças" contributor_title: "Contrato de Licença de Colaborador" contributor_description_prefix: "Todos os colaboradores, tanto no nosso site quando no nosso repositório no GitHub estão sujeitos ao nosso" diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index 2b163f12a..e58a3cee8 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: legal: page_title: "Legal" opensource_intro: "O CodeCombat é gratuito para jogar e é totalmente open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Confere " github_url: "o nosso GitHub" opensource_description_center: "e ajuda se quiseres! O CodeCombat é construído tendo por base dezenas de projetos open source, os quais nós amamos. Vê " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: practices_title: "Melhores Práticas Respeitosas" practices_description: "Estas são as nossas promessas para contigo, o jogador, com um pouco menos de politiquices." privacy_title: "Privacidade" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Segurança" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." email_title: "E-mail" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: email_settings_url: "tuas definições de e-mail" email_description_suffix: "ou através de ligações presentes nos e-mails que enviamos, podes mudar as tuas preferências e parar a tua subscrição facilmente, em qualquer momento." cost_title: "Custo" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Direitos Autorais e Licensas" contributor_title: "Contrato de Licença do Contribuinte (CLA)" contributor_description_prefix: "Todas as contribuições, tanto no sítio como no nosso repositório GitHub, estão sujeitas ao nosso" diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index c2db60ea9..cdcad7421 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman legal: page_title: "Aspecte Legale" opensource_intro: "CodeCombat este free-to-play și complet open source." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Vizitează " 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" @@ -918,7 +917,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman 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_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." 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" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman 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_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." 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" diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index f356631c7..cefda9e3f 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi legal: page_title: "Юридическая информация" opensource_intro: "CodeCombat - бесплатный проект с полностью открытым исходным кодом." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Посмотрите " github_url: "наш GitHub" opensource_description_center: "и посодействуйте, если вам понравилось! CodeCombat построен на десятках проектов с открытым кодом, и мы любим их. Загляните в " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi practices_title: "Уважаемые лучшие практики" practices_description: "Это наши обещания тебе, игроку, менее юридическим языком." privacy_title: "Конфиденциальность" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Безопасность" security_description: "Мы стремимся сохранить вашу личную информацию в безопасности. Как проект с открытым исходным кодом, наш сайт открыт для всех в вопросах пересмотра и совершенствования систем безопасности." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi email_description_suffix: "или через ссылки в email-ах, которые мы отправляем, вы можете изменить предпочтения и легко отписаться в любой момент." cost_title: "Стоимость" cost_description: "В настоящее время, CodeCombat 100% бесплатен! Одной из наших главных целей является сохранить его таким, чтобы как можно больше людей могли играть, независимо от места в жизни. Если небо потемнеет, мы, возможно, введём подписки, возможно, только на некоторый контент, но нам не хотелось бы. Если повезёт, мы сможем поддерживать компанию, используя" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Авторские права и лицензии" contributor_title: "Лицензионное соглашение соавторов" contributor_description_prefix: "Все вклады, как на сайте, так и на нашем репозитории GitHub, подпадают под наше" diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee index 69108f840..d01ceb673 100644 --- a/app/locale/sk.coffee +++ b/app/locale/sk.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee index 46fb45a39..c42789613 100644 --- a/app/locale/sl.coffee +++ b/app/locale/sl.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee index da99b70eb..d635494f8 100644 --- a/app/locale/sr.coffee +++ b/app/locale/sr.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee index f049ee2ef..bc608af38 100644 --- a/app/locale/sv.coffee +++ b/app/locale/sv.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr legal: page_title: "Juridik" opensource_intro: "CodeCombat är gratis att spela och helt öppen programvara." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Spana in " github_url: "vår GitHub" opensource_description_center: " och hjälp till om du vill! CodeCombat är byggt på dussintals projekt med öppen källkod, och vi älskar dem. Se " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr practices_title: "Respektfulla \"best practices\"" practices_description: "Dessa är våra löften till dig, spelaren, på lite mindre juristspråk." privacy_title: "Integritet" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Säkerhet" security_description: "Vi strävar efter att hålla din personliga information säker. Eftersom vår källkod är öppen är vår det fritt fram för vem som helst att granska och förbättra våra säkerhetssystem." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr email_description_suffix: "eller genom länkar i mailen vi skickar kan du ändra dina inställningar och lätt avprenumerera när som helst." cost_title: "Kostnad" cost_description: "För närvarande är CodeCombat 100 % gratis! Ett av våra främsta mål är att behålla det så, så att så många som möjligt kan spela, oavsett plats i livet. Om himlen mörknar, kanske vi behöver ta betalt för prenumerationer eller något innehåll, men helst slipper vi det. Med lite tur lyckas vi hålla liv i företag med:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Upphovsrätt och licenser" contributor_title: "Överenskommelse för bidragarlicens" contributor_description_prefix: "Alla bidrag, både på sajten och på vårt GitHub-repo, faller under vår" diff --git a/app/locale/th.coffee b/app/locale/th.coffee index 6dcef569a..f2688ae81 100644 --- a/app/locale/th.coffee +++ b/app/locale/th.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee index f01928092..23a77f057 100644 --- a/app/locale/tr.coffee +++ b/app/locale/tr.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t legal: page_title: "Hukuki" opensource_intro: "CodeCombat ücretsiz oynanılabilir ve tamamen açık kaynaklıdır." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "İster " github_url: "GitHub'ımıza" opensource_description_center: "bakıver ve hoşuna giderse yardım edebilirsin! CodeCombat bir sürü açık kaynaklı projeden yararlanılarak inşa edilmiştir, hepsini seviyoruz. Bu projeleri görmek istersen " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t practices_title: "Saygı Çerçevesinde En İyi Uygulamalar" practices_description: "Saygıdeğer oyuncu, bunlar size verdiğimiz sözlerimizdir. Daha kolay anlaşılması açısından özet haline indirgenmiştir." privacy_title: "Mahremiyet" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Güvenlik" security_description: "Kişisel bilgilerinizi güvende tutmak için mücadele ediyoruz. Açık kaynaklı bir proje olarak, sitemiz herkesin görüşüne açıktır ve güvenlik sistemimizin geliştirilmesine yardımcı olabilirsiniz." email_title: "Eposta" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t email_description_suffix: "ister size gönderdiğimiz epostadaki linklerden, tercihlerinizi değiştirebilir ve aboneliğinizi anında iptal edebilirsiniz." cost_title: "Ücret" cost_description: "Şu anda CodeCombat tamamıyla ücretsiz! Esas amaçlarımızdan biri bu şekilde devam etmek, bu sayede hayattaki konumu fark etmeksizin olabildiğince çok insan oynayarak kodlamayı öğrenebilir. Eğer koşullar olumsuz yönde değişirse, abonelik veya bazı içerikler için belirli ücretler talep edilebilir, ama bunu tercih etmeyiz. Temennimiz şudur ki, şirketi şu biçimde sürdürmeye devam edebiliriz:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Telif Hakları ve Lisanslar" contributor_title: "Katılımcı Lisans Sözleşmesi" contributor_description_prefix: "GitHub ve siteye yapılan tüm katılımlar, devam etmeden önce kabul etmeniz gereken" diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index d5bd191fa..cb9e7e508 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "українська мова", englishDesc # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "українська мова", englishDesc legal: page_title: "Юридична інформація" opensource_intro: "CodeCombat - безкоштовна гра з повністю відкритим кодом." -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "Завітайте" github_url: "на наш GitHub" opensource_description_center: "та долучайтесь, якщо хочете! CodeCombat побудовано на десятках проектів із вікритим кодом. і ми любимо їх. Перегляньте " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "українська мова", englishDesc practices_title: "Шановні найкращі гравці" # practices_description: "These are our promises to you, the player, in slightly less legalese." privacy_title: "Конфіденційність" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "Безпека" security_description: "Ми прагнемо зберегти вашу особисту інформацію в безпеці. Як проект з відкритим кодом, наш сайт є вільно відкритим для всіх, щоб переглянути та удосконалити наші системи безпеки." email_title: "Email" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "українська мова", englishDesc email_description_suffix: "або через посилання в повідомленням котрі ми присилаємо, ви можете змінити ваші уподобання і легко відмовитись від підписки в будь-який час." cost_title: "Вартість" cost_description: "На даний час, CodeCombat є безкоштовним на усі 100%! Однією з наших цілей є рухатись у цьому ж напрямку, так що у цю гру можуть грати стільки людей, наскільки це можливо, незалежно від місця проживання. Якщо настануть важкі часи, ми будем змушені стягувати плату за певний контент, але ми б не хотіли цього. Якщо пощастить, ми зможемо підтримувати компанію разом з:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Авторські права та ліцензії" contributor_title: "Авторська ліцензійна згода" contributor_description_prefix: "Усі права, як на сайті так і у нашому сховищі GitHub, є у відповідності з нашими" diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee index bda5d5e9c..cf4cf0ac4 100644 --- a/app/locale/ur.coffee +++ b/app/locale/ur.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee index 25185e13e..cac654ba7 100644 --- a/app/locale/vi.coffee +++ b/app/locale/vi.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index ec3058605..b782c1a05 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese legal: page_title: "法律" opensource_intro: "CodeCombat 是一个自由发挥,完全开源的项目。" -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "查看 " github_url: "我们的 GitHub" opensource_description_center: "并做你想做的修改吧!CodeCombat 是构筑在几十个开源项目之上的,我们爱它们。请查阅" @@ -918,7 +917,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese practices_title: "尊重最佳实践" practices_description: "这是我们对您的承诺,即玩家,尽管这在法律用语中略显不足。" privacy_title: "隐私" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "安全" security_description: "我们竭力保证您的个人信息安全性。作为一个开源项目,任何人都可以检讨并改善我们自由开放的网站的安全性。" email_title: "电子邮件" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese email_description_suffix: "或者我们发送的邮件中的链接,您可以随时更改您的偏好设置或者随时取消订阅。" cost_title: "花费" cost_description: "目前来说,CodeCombat 是完全免费的!我们的主要目标之一也是保持目前这种方式,让尽可能多的人玩得更好,不论是否是生活中。如果天空变暗,我们可能会对某些内容采取订阅收费,但我们宁愿不那么做。运气好的话,我们可以维持公司,通过:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "版权与许可" contributor_title: "贡献者许可协议" contributor_description_prefix: "所有对本网站或是 GitHub 代码库的贡献都依照我们的" diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index 493124707..3cd3028fc 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee index d71e50457..873d9d987 100644 --- a/app/locale/zh-WUU-HANS.coffee +++ b/app/locale/zh-WUU-HANS.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -908,8 +908,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # legal: # page_title: "Legal" -# opensource_intro: "CodeCombat is free to play and completely open source." -# opensource_intro_2: "CodeCombat completely open source." +# opensource_intro: "CodeCombat is completely open source." # opensource_description_prefix: "Check out " # github_url: "our GitHub" # opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See " @@ -918,7 +917,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # practices_title: "Respectful Best Practices" # practices_description: "These are our promises to you, the player, in slightly less legalese." # privacy_title: "Privacy" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." # security_title: "Security" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." # email_title: "Email" @@ -926,8 +925,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # email_settings_url: "your email settings" # email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." # cost_title: "Cost" -# cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." +# cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." # copyrights_title: "Copyrights and Licenses" # contributor_title: "Contributor License Agreement" # contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee index 8c9b91c53..be6e724ef 100644 --- a/app/locale/zh-WUU-HANT.coffee +++ b/app/locale/zh-WUU-HANT.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # parents: "For Parents" # parents_title: "Your child will learn to code." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For 9.99/mo, they get new challenges every week and personal email support from professional programmers." +# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" # stripe_description: "Monthly Subscription" @@ -909,7 +909,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio legal: page_title: "律法" opensource_intro: "CodeCombat 是一個候自發揮,整個開源個項目。" -# opensource_intro_2: "CodeCombat completely open source." opensource_description_prefix: "望 " github_url: "我裏個 GitHub" opensource_description_center: "做爾想做個改動嘈!CodeCombat 是起徠幾十個開源項目上向,我裏中意渠裏。望" @@ -918,7 +917,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio practices_title: "尊重最讚真做" practices_description: "箇是我裏對爾個保證,也佩是攪個人,徠法律用語裏向望起扣搭弗足相。" privacy_title: "隱私" -# privacy_description_2: "We will not sell any of your personal information." +# privacy_description: "We will not sell any of your personal information." security_title: "安全" security_description: "我裏儘話保證爾個個人隱私安全。當開源項目,管感爾都好檢查搭改進我裏自由開放個網站個安全。" email_title: "電子郵箱" @@ -927,7 +926,6 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio email_description_suffix: "要勿我裏發畀爾個信裏向有鏈接,爾随低2都好改偏向設定要勿取消訂閱。" cost_title: "花銷" cost_description: "目前來講,CodeCombat 是全個免費個!我裏個大目標之一也是保持目前箇種方式,讓越多越好個人攪功還好,弗管是弗是生活裏向。空把天黯落來,我裏嘸數會畀訂一許內容收費,不過我裏能可弗馨妝。運道好個話,我裏好開公司,通過:" -# cost_description_2: "CodeCombat is free to play in the dungeon campaign, with a $9.99/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "版權搭許可" contributor_title: "貢獻者許可協議" contributor_description_prefix: "所有對本網站要勿 GitHub 代碼庫個努力都照我裏個" From 7a89d30bb61bfaa81ed15d5058a67a352175b496 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 20:21:13 +0000 Subject: [PATCH 26/32] Update pt-PT.coffee --- app/locale/pt-PT.coffee | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index e58a3cee8..c958e7399 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -4,7 +4,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: no_ie: "O CodeCombat não funciona no Internet Explorer 8 ou anterior. Desculpa!" # Warning that only shows up in IE8 and older no_mobile: "O CodeCombat não foi feito para dispositivos móveis e pode não funcionar!" # Warning that shows up on mobile devices play: "Jogar" # The big play button that just starts playing a level -# try_it: "Try It" # Alternate wording for Play button + try_it: "Experimenta" # Alternate wording for Play button old_browser: "Ups, o teu navegador é demasiado antigo para que o CodeCombat funcione. Desculpa!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Mesmo assim podes tentar, mas provavelmente não irá funcionar." ipad_browser: "Más notícias: o CodeCombat não funciona no navegador do iPad. Boas notícias: a nossa aplicação nativa para iPad está à espera da aprovação da Apple." @@ -71,9 +71,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: buy_gems: "Comprar Gemas" campaign_forest: "Campanha da Floresta" campaign_dungeon: "Campanha da Masmorra" -# subscription_required: "Subscription Required" -# free: "Free" -# subscribed: "Subscribed" + subscription_required: "Subscrição Necessária" + free: "Gratuita" + subscribed: "Subscrito(a)" older_campaigns: "Campanhas Mais Antigas" anonymous: "Jogador Anónimo" level_difficulty: "Dificuldade: " @@ -296,7 +296,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: tip_hofstadters_law: "Lei de Hofstadter: Tudo demora sempre mais do que pensas, mesmo quando levas em conta a Lei de Hofstadter." tip_premature_optimization: "Uma otimização permatura é a raíz de todo o mal. - Donald Knuth" tip_brute_force: "Quando em dúvida, usa a força bruta. - Ken Thompson" -# tip_extrapolation: "There are only two kinds of people: those that can extrapolate from incomplete data..." + tip_extrapolation: "Há apenas dois tipos de pessoas: aquelas que conseguem tirar uma conclusão a partir de dados reduzidos.." customize_wizard: "Personalizar Feiticeiro" game_menu: @@ -337,20 +337,20 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: prompt_body: "Queres obter mais?" prompt_button: "Entra na Loja" -# subscribe: -# subscribe_title: "Subscribe" -# levels: "Unlock 25 levels! With 5 new ones every week!" -# heroes: "More powerful heroes!" -# gems: "3500 bonus gems every month!" -# items: "Over 250 bonus items!" -# parents: "For Parents" -# parents_title: "Your child will learn to code." -# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." -# parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." -# parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." -# subscribe_button: "Subscribe Now" -# stripe_description: "Monthly Subscription" -# subscription_required_to_play: "You'll need a subscription to play this level." + subscribe: + subscribe_title: "Subscrever" + levels: "Desbloqueia 25 níveis! Com mais 5 novos por semana!" + heroes: "Heróis mais poderosos!" + gems: "3500 gemas de bónus todos os meses!" + items: "Mais de 250 itens de bónus!" + parents: "Para Educadores" + parents_title: "O teu educando vai aprender a programar." + parents_blurb1: "Com o CodeCombat, o teu educando aprende ao escrever código real. Começa por aprender comandos simples e progride para tópicos mais avançados." + parents_blurb2: "Por $9.99 USD/mês, recebe novos desafios todas as semanas e suporte pessoal, via e-mail, de programadores profissionais." + parents_blurb3: "Sem Risco: 100% de garantia de devolução do dinheiro, com anulação fácil de 1 clique." + subscribe_button: "Subscrever Agora" + stripe_description: "Subscrição Mensal" + subscription_required_to_play: "Precisas de uma subscrição para jogares este nível." choose_hero: choose_hero: "Escolhe o Teu Herói" @@ -821,9 +821,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: service: "Serviço" price: "Preço" gems: "Gemas" -# status_subscribed: "You're currently subscribed at $9.99 USD/mo. Thanks for your support!" -# 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!" + status_subscribed: "Atualmente, estás subscrito por $9.99 USD/mês. Agradecemos o teu apoio!" + status_unsubscribed_active: "Não estás subscrito e não te vamos cobrar, mas a tua conta ainda está ativa, por agora." + status_unsubscribed: "Ganha acesso a novos níveis, heróis, itens e gemas de bónus com uma subscrição do CodeCombat!" loading_error: could_not_load: "Erro ao carregar do servidor" @@ -908,7 +908,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: legal: page_title: "Legal" - opensource_intro: "O CodeCombat é gratuito para jogar e é totalmente open source." + opensource_intro: "O CodeCombat é completamente open source." opensource_description_prefix: "Confere " github_url: "o nosso GitHub" opensource_description_center: "e ajuda se quiseres! O CodeCombat é construído tendo por base dezenas de projetos open source, os quais nós amamos. Vê " @@ -917,7 +917,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: practices_title: "Melhores Práticas Respeitosas" practices_description: "Estas são as nossas promessas para contigo, o jogador, com um pouco menos de politiquices." privacy_title: "Privacidade" -# privacy_description: "We will not sell any of your personal information." + privacy_description: "Nós não vamos vender nenhuma das tuas informações pessoais." security_title: "Segurança" # security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems." email_title: "E-mail" From 074c16733b72fb50062a5cbc586de378bd3c929a Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 5 Dec 2014 20:23:06 +0000 Subject: [PATCH 27/32] Update pt-PT.coffee --- app/locale/pt-PT.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index c958e7399..00992f803 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -296,7 +296,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: tip_hofstadters_law: "Lei de Hofstadter: Tudo demora sempre mais do que pensas, mesmo quando levas em conta a Lei de Hofstadter." tip_premature_optimization: "Uma otimização permatura é a raíz de todo o mal. - Donald Knuth" tip_brute_force: "Quando em dúvida, usa a força bruta. - Ken Thompson" - tip_extrapolation: "Há apenas dois tipos de pessoas: aquelas que conseguem tirar uma conclusão a partir de dados reduzidos.." + tip_extrapolation: "Há apenas dois tipos de pessoas: aquelas que conseguem tirar uma conclusão a partir de dados reduzidos..." customize_wizard: "Personalizar Feiticeiro" game_menu: From 3304fedb165532029f131e01c7e66776070d90b5 Mon Sep 17 00:00:00 2001 From: Anders Bernard Date: Fri, 5 Dec 2014 22:16:48 +0100 Subject: [PATCH 28/32] Update de-DE.coffee --- app/locale/de-DE.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index a122e00bf..6da42e13e 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -641,7 +641,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: character_classes_title: "Charakter Klassen" introduction_desc_intro: "Wir haben hohe Erwartungen für CodeCombat." introduction_desc_pref: "Wir wollen ein Ort sein, an dem sich Programmierer aller coleur treffen, um gemeinsam zu spielen und zu lernen. Wo sie andere in die wunderbare Welt des Programmierens einführen, und dabei die besten Aspekte der Programmierer-Community verkörpern. Wir können und wollen dies nicht alleine tun. Projekte wie GitHub, Stack Overflow and Linux leben von den großartigen Leuten die sie bauen und nutzen. Darum ist, " - introduction_desc_github_url: "CodeCombat komplett OpenSource" + introduction_desc_github_url: "CodeCombat ist komplett OpenSource" introduction_desc_suf: ". Wir wollen es dir so einfach und vielfältig wie irgend möglich machen, dich an diesem Projekt zu beteiligen. Damit es genauso zu deinem Projekt wird, wie zu unserem." introduction_desc_ending: "Wir hoffen du nimmst an unserer Party teil!" introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" From 209836c17267b7e7dbca473af9eb320d6d7ad6a8 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Fri, 5 Dec 2014 14:11:38 -0800 Subject: [PATCH 29/32] Fixed user patching to not also unsubscribe subscribers. --- app/views/account/PaymentsView.coffee | 5 +++-- app/views/play/modal/SubscribeModal.coffee | 4 ++-- server/payments/subscription_handler.coffee | 6 +++++- server/users/user_handler.coffee | 7 +++++-- test/server/functional/discount_handler.spec.coffee | 2 +- test/server/functional/subscription.spec.coffee | 13 +++++++------ 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/views/account/PaymentsView.coffee b/app/views/account/PaymentsView.coffee index 931b825a9..992cbd8fa 100644 --- a/app/views/account/PaymentsView.coffee +++ b/app/views/account/PaymentsView.coffee @@ -36,7 +36,8 @@ module.exports = class PaymentsView extends RootView document.location.reload() onClickEndSubscription: (e) -> - stripe = me.get('stripe') + stripe = _.clone(me.get('stripe')) delete stripe.planID - me.save() + me.set('stripe', stripe) + me.patch({headers: {'X-Change-Plan': 'true'}}) @listenToOnce me, 'sync', -> document.location.reload() diff --git a/app/views/play/modal/SubscribeModal.coffee b/app/views/play/modal/SubscribeModal.coffee index cc8af4bb7..9474634ff 100644 --- a/app/views/play/modal/SubscribeModal.coffee +++ b/app/views/play/modal/SubscribeModal.coffee @@ -60,14 +60,14 @@ module.exports = class SubscribeModal extends ModalView @state = 'purchasing' @render() - stripe = me.get('stripe') ? {} + stripe = _.clone(me.get('stripe') ? {}) stripe.planID = @product.planID stripe.token = e.token.id me.set 'stripe', stripe @listenToOnce me, 'sync', @onSubscriptionSuccess @listenToOnce me, 'error', @onSubscriptionError - me.save() + me.patch({headers: {'X-Change-Plan': 'true'}}) onSubscriptionSuccess: -> application.tracker?.trackEvent 'Finished subscription purchase', {} diff --git a/server/payments/subscription_handler.coffee b/server/payments/subscription_handler.coffee index f1d0531e5..fdf428873 100644 --- a/server/payments/subscription_handler.coffee +++ b/server/payments/subscription_handler.coffee @@ -20,7 +20,7 @@ class SubscriptionHandler extends Handler if (not req.user) or req.user.isAnonymous() return done({res: 'You must be signed in to subscribe.', code: 403}) - token = req.body.stripe?.token + token = req.body.stripe.token customerID = user.get('stripe')?.customerID if not (token or customerID) @logSubscriptionError(req, 'Missing stripe token or customer ID.') @@ -29,6 +29,10 @@ class SubscriptionHandler extends Handler if token if customerID stripe.customers.update customerID, { card: token }, (err, customer) => + if err or not customer + # should not happen outside of test and production polluting each other + @logSubscriptionError(req, 'Cannot find customer: ', +customer.id + '\n\n' + err) + return done({res: 'Cannot find customer.', code: 404}) @checkForExistingSubscription(req, user, customer, done) else diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee index c413d93da..5e1d07de6 100644 --- a/server/users/user_handler.coffee +++ b/server/users/user_handler.coffee @@ -110,8 +110,10 @@ UserHandler = class UserHandler extends Handler # Subscription setting (req, user, callback) -> + return callback(null, req, user) unless req.headers['x-change-plan'] # ensure only saves that are targeted at changing the subscription actually affect the subscription + return callback(null, req, user) unless req.body.stripe hasPlan = user.get('stripe')?.planID? - wantsPlan = req.body.stripe?.planID? + wantsPlan = req.body.stripe.planID? return callback(null, req, user) if hasPlan is wantsPlan if wantsPlan and not hasPlan @@ -127,9 +129,10 @@ UserHandler = class UserHandler extends Handler # Discount setting (req, user, callback) -> + return callback(null, req, user) unless req.body.stripe return callback(null, req, user) unless req.user?.isAdmin() hasCoupon = user.get('stripe')?.couponID - wantsCoupon = req.body.stripe?.couponID + wantsCoupon = req.body.stripe.couponID return callback(null, req, user) if hasCoupon is wantsCoupon if wantsCoupon and (hasCoupon isnt wantsCoupon) diff --git a/test/server/functional/discount_handler.spec.coffee b/test/server/functional/discount_handler.spec.coffee index 909b97f41..1a3500fc1 100644 --- a/test/server/functional/discount_handler.spec.coffee +++ b/test/server/functional/discount_handler.spec.coffee @@ -75,7 +75,7 @@ describe '/db/user, editing stripe.couponID property', -> loginJoe (joe) -> joeData.stripe.token = stripeTokenID joeData.stripe.planID = 'basic' - request.put {uri: userURL, json: joeData }, (err, res, body) -> + request.put {uri: userURL, json: joeData, headers: {'X-Change-Plan': 'true'} }, (err, res, body) -> joeData = body expect(res.statusCode).toBe(200) stripe.customers.retrieve joeData.stripe.customerID, (err, customer) -> diff --git a/test/server/functional/subscription.spec.coffee b/test/server/functional/subscription.spec.coffee index f2e5d37b4..68711a9cf 100644 --- a/test/server/functional/subscription.spec.coffee +++ b/test/server/functional/subscription.spec.coffee @@ -85,6 +85,7 @@ describe '/db/user, editing stripe property', -> stripe = require('stripe')(config.stripe.secretKey) userURL = getURL('/db/user') webhookURL = getURL('/stripe/webhook') + headers = {'X-Change-Plan': 'true'} it 'clears the db first', (done) -> clearModels [User, Payment], (err) -> @@ -95,7 +96,7 @@ describe '/db/user, editing stripe property', -> request.get getURL('/auth/whoami'), (err, res, body) -> body = JSON.parse(body) body.stripe = { planID: 'basic', token: '12345' } - request.put {uri: userURL, json: body}, (err, res, body) -> + request.put {uri: userURL, json: body, headers: headers}, (err, res, body) -> expect(res.statusCode).toBe 403 done() @@ -114,7 +115,7 @@ describe '/db/user, editing stripe property', -> token: stripeTokenID planID: 'basic' } - request.put {uri: userURL, json: joeData }, (err, res, body) -> + request.put {uri: userURL, json: joeData, headers: headers }, (err, res, body) -> expect(res.statusCode).toBe(402) done() @@ -129,7 +130,7 @@ describe '/db/user, editing stripe property', -> token: stripeTokenID planID: 'basic' } - request.put {uri: userURL, json: joeData }, (err, res, body) -> + request.put {uri: userURL, json: joeData, headers: headers }, (err, res, body) -> joeData = body expect(res.statusCode).toBe(200) expect(joeData.purchased.gems).toBe(3500) @@ -156,7 +157,7 @@ describe '/db/user, editing stripe property', -> it 'schedules the stripe subscription to be cancelled when stripe.planID is removed from the user', (done) -> delete joeData.stripe.planID - request.put {uri: userURL, json: joeData }, (err, res, body) -> + request.put {uri: userURL, json: joeData, headers: headers }, (err, res, body) -> joeData = body expect(res.statusCode).toBe(200) expect(joeData.stripe.subscriptionID).toBeDefined() @@ -170,7 +171,7 @@ describe '/db/user, editing stripe property', -> it 'allows you to sign up again using the same customer ID as before, no token necessary', (done) -> joeData.stripe.planID = 'basic' - request.put {uri: userURL, json: joeData }, (err, res, body) -> + request.put {uri: userURL, json: joeData, headers: headers }, (err, res, body) -> joeData = body expect(res.statusCode).toBe(200) @@ -208,7 +209,7 @@ describe '/db/user, editing stripe property', -> it "updates the customer's email when you change the user's email", (done) -> joeData.email = 'newEmail@gmail.com' - request.put {uri: userURL, json: joeData }, (err, res, body) -> + request.put {uri: userURL, json: joeData, headers: headers }, (err, res, body) -> f = -> stripe.customers.retrieve joeData.stripe.customerID, (err, customer) -> expect(customer.email).toBe('newEmail@gmail.com') done() From d6265a406565c22dc3b40ebb7400d9e4951090a3 Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Fri, 5 Dec 2014 14:15:40 -0800 Subject: [PATCH 30/32] Fix default locked code css MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Couldn’t get multiple ranges to highlight ranges correctly, so leaving it on for python and coffeescript only. --- app/styles/play/level/tome/spell.sass | 6 +-- app/views/play/level/tome/SpellView.coffee | 51 ++++++++++++++++++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/app/styles/play/level/tome/spell.sass b/app/styles/play/level/tome/spell.sass index 964288585..ca0bf50bb 100644 --- a/app/styles/play/level/tome/spell.sass +++ b/app/styles/play/level/tome/spell.sass @@ -107,9 +107,6 @@ .executed background-color: rgba(110, 110, 110, 0.12) - .locked-code - border: 1px dashed rgba(53, 45, 34, 0.5) - +keyframes(pulseRedBackground) from background-color: rgba(255, 45, 27, 0.4) @@ -175,6 +172,9 @@ // Override faint gray border-color: #BFF + .locked-code + border: 1px dashed rgba(53, 45, 34, 0.5) + // Decided it wasn't useful to show what can be hovered, since almost anything can, so we have to make it too faint to be useful if we don't want it to be really distracting. //.ace_identifier // border-bottom: 1px dotted rgba(0, 51, 255, 0.25) diff --git a/app/views/play/level/tome/SpellView.coffee b/app/views/play/level/tome/SpellView.coffee index cf1486b22..e089de89a 100644 --- a/app/views/play/level/tome/SpellView.coffee +++ b/app/views/play/level/tome/SpellView.coffee @@ -257,7 +257,6 @@ module.exports = class SpellView extends CocoView # TODO: Lock default indent for an empty line? return unless LevelOptions[@options.level.get('slug')]?.lockDefaultCode or CampaignOptions?.getOption?(@options?.level?.get?('slug'), 'lockDefaultCode') return unless @spell.source is @spell.originalSource or force - return if @spell.language in ['javascript', 'lua', 'clojure', 'io'] # Only works for languages without closing delimeters on blocks currently console.info 'Locking down default code.' @@ -294,16 +293,50 @@ module.exports = class SpellView extends CocoView wrapper => orig.apply obj, args obj[method] - if @lockedCodeMarkerID? - @aceSession.removeMarker @lockedCodeMarkerID - @lockedCodeMarkerID = null + finishRange = (row, startRow, startColumn) => + range = new Range startRow, startColumn, row, @aceSession.getLine(row).length - 1 + range.start = @aceDoc.createAnchor range.start + range.end = @aceDoc.createAnchor range.end + range.end.$insertRight = true + @readOnlyRanges.push range + + # Remove previous locked code highlighting + if @lockedCodeMarkerIDs? + @aceSession.removeMarker marker for marker in @lockedCodeMarkerIDs + @lockedCodeMarkerIDs = [] + + # Create locked default code text ranges @readOnlyRanges = [] - lines = @aceDoc.getAllLines() - lastRow = row for line, row in lines when not /^\s*$/.test(line) - if lastRow? - @readOnlyRanges.push new Range 0, 0, lastRow, lines[lastRow].length - 1 - @lockedCodeMarkerID = @aceSession.addMarker @readOnlyRanges[0], 'locked-code', 'fullLine' + if @spell.language in ['python', 'coffeescript'] + # Lock contiguous section of default code + # Only works for languages without closing delimeters on blocks currently + lines = @aceDoc.getAllLines() + lastRow = row for line, row in lines when not /^\s*$/.test(line) + if lastRow? + @readOnlyRanges.push new Range 0, 0, lastRow, lines[lastRow].length - 1 + + # TODO: Highlighting does not work for multiple ranges + # TODO: Everything looks correct except the actual result. + # TODO: https://github.com/codecombat/codecombat/issues/1852 + # else + # # Create a read-only range for each chunk of text not separated by an empty line + # startRow = startColumn = null + # for row in [0...@aceSession.getLength()] + # unless /^\s*$/.test @aceSession.getLine(row) + # unless startRow? and startColumn? + # startRow = row + # startColumn = 0 + # else + # if startRow? and startColumn? + # finishRange row - 1, startRow, startColumn + # startRow = startColumn = null + # if startRow? and startColumn? + # finishRange @aceSession.getLength() - 1, startRow, startColumn + + # Highlight locked ranges + for range in @readOnlyRanges + @lockedCodeMarkerIDs.push @aceSession.addMarker range, 'locked-code', 'fullLine' # Override write operations that intersect with default code interceptCommand @ace, 'onPaste', preventReadonly From 6344b0c1a37c81dbab752ecf7314ba1fda6e7d95 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Fri, 5 Dec 2014 15:44:49 -0800 Subject: [PATCH 31/32] Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only. --- app/locale/de-DE.coffee | 2 +- app/locale/en.coffee | 10 +- app/locale/pt-PT.coffee | 2 +- app/locale/ru.coffee | 4 +- app/models/User.coffee | 13 -- .../play/level/modal/hero-victory-modal.sass | 10 -- app/styles/play/world-map-view.sass | 7 +- .../play/level/modal/hero-victory-modal.jade | 5 - app/templates/play/modal/subscribe-modal.jade | 9 +- app/templates/play/world-map-view.jade | 26 ++-- app/views/play/WorldMapView.coffee | 142 ++++++++++-------- .../play/level/modal/HeroVictoryModal.coffee | 33 +--- 12 files changed, 109 insertions(+), 154 deletions(-) diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index 6da42e13e..2fb32c7d0 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: parents: "Für Eltern" parents_title: "Dein Kind lernt zu programmieren." parents_blurb1: "Mit CodeCombat, lernt dein Kind richtige Programme zu schreiben. Es fängt mit einfachen Befehlen an, und schreitet ganz unmerklich zu schwierigeren Themen fort." - parents_blurb2: "Für 9.99 im Monat, bekommt es jede Woche neue Herausforderungen sowie persönlichen email support von professionellen Programmierern." + parents_blurb2: "Für 9.99 im Monat, bekommt es jede Woche neue Herausforderungen sowie persönlichen email support von professionellen Programmierern." # Please update based on new wording from en.coffee parents_blurb3: "Kein Risiko: 100% Geld zurück Garantie, und 1-Klick Abokündigung." subscribe_button: "Abonniere jetzt" stripe_description: "Monatsabo" diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 3d2c72a16..1abce903b 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -227,12 +227,6 @@ victory_rate_the_level: "Rate the level: " # Only in old-style levels. victory_return_to_ladder: "Return to Ladder" victory_play_continue: "Continue" - victory_play_skip: "Skip Ahead" - victory_play_next_level: "Play Next Level" - victory_play_more_practice: "More Practice" - victory_play_too_easy: "Too Easy" - victory_play_just_right: "Just Right" - victory_play_too_hard: "Too Hard" victory_saving_progress: "Saving Progress" victory_go_home: "Go Home" # Only in old-style levels. victory_review: "Tell us more!" # Only in old-style levels. @@ -339,7 +333,7 @@ subscribe: subscribe_title: "Subscribe" - levels: "Unlock 25 levels! With 5 new ones every week!" + levels: "Unlock 17 extra levels! With 5 new ones every week!" heroes: "More powerful heroes!" gems: "3500 bonus gems every month!" items: "Over 250 bonus items!" @@ -925,7 +919,7 @@ email_settings_url: "your email settings" email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time." cost_title: "Cost" - cost_description: "CodeCombat is free to play in the dungeon campaign, with a $9.99 USD/mo subscription for access to later campaigns and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." + cost_description: "CodeCombat is free to play for all of its core levels, with a $9.99 USD/mo subscription for access to extra level branches and 3500 bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee." copyrights_title: "Copyrights and Licenses" contributor_title: "Contributor License Agreement" contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our" diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index 00992f803..f5ce50a71 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: parents: "Para Educadores" parents_title: "O teu educando vai aprender a programar." parents_blurb1: "Com o CodeCombat, o teu educando aprende ao escrever código real. Começa por aprender comandos simples e progride para tópicos mais avançados." - parents_blurb2: "Por $9.99 USD/mês, recebe novos desafios todas as semanas e suporte pessoal, via e-mail, de programadores profissionais." + parents_blurb2: "Por $9.99 USD/mês, recebe novos desafios todas as semanas e suporte pessoal, via e-mail, de programadores profissionais." # Please update based on new wording from en.coffee parents_blurb3: "Sem Risco: 100% de garantia de devolução do dinheiro, com anulação fácil de 1 clique." subscribe_button: "Subscrever Agora" stripe_description: "Subscrição Mensal" diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index adc0cd7b3..4a40d9a43 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -346,7 +346,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi parents: "Для Родителей" parents_title: "Ваш ребенок научиться программировать." parents_blurb1: "С CodeCombat ваш ребенок учится через написание реального кода. Начиная с изучения простых команд, продолжая более продвинутыми темами." - parents_blurb2: "За $9.99/месяц они получат новые испытания каждую неделю и персональную поддержку профессиональных программистов через электронную почту." + parents_blurb2: "За $9.99/месяц они получат новые испытания каждую неделю и персональную поддержку профессиональных программистов через электронную почту." # Please update based on new wording from en.coffee parents_blurb3: "Без риска: 100% гарантия возрата денег, возможность отписаться в 1 клик." subscribe_button: "Подпишись сейчас" stripe_description: "Месячная подписка" @@ -925,7 +925,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi email_settings_url: "ваши email настройки" email_description_suffix: "или через ссылки в email-ах, которые мы отправляем, вы можете изменить предпочтения и легко отписаться в любой момент." cost_title: "Стоимость" - cost_description: "В настоящее время, CodeCombat 100% бесплатен! Одной из наших главных целей является сохранить его таким, чтобы как можно больше людей могли играть, независимо от места в жизни. Если небо потемнеет, мы, возможно, введём подписки, возможно, только на некоторый контент, но нам не хотелось бы. Если повезёт, мы сможем поддерживать компанию, используя" + #cost_description: "В настоящее время, CodeCombat 100% бесплатен! Одной из наших главных целей является сохранить его таким, чтобы как можно больше людей могли играть, независимо от места в жизни. Если небо потемнеет, мы, возможно, введём подписки, возможно, только на некоторый контент, но нам не хотелось бы. Если повезёт, мы сможем поддерживать компанию, используя" # Please update based on new wording from en.coffee copyrights_title: "Авторские права и лицензии" contributor_title: "Лицензионное соглашение соавторов" contributor_description_prefix: "Все вклады, как на сайте, так и на нашем репозитории GitHub, подпадают под наше" diff --git a/app/models/User.coffee b/app/models/User.coffee index 594d21c34..716f71443 100644 --- a/app/models/User.coffee +++ b/app/models/User.coffee @@ -102,19 +102,6 @@ module.exports = class User extends CocoModel myHeroClasses.push heroClass for heroClass, heroSlugs of ThangType.heroClasses when _.intersection(myHeroSlugs, heroSlugs).length myHeroClasses - getBranchingGroup: -> - return @branchingGroup if @branchingGroup - return 'all-practice' # A/B test paused for Hour of Code - group = me.get('testGroupNumber') % 4 - @branchingGroup = switch group - when 0 then 'no-practice' - when 1 then 'all-practice' - when 2 then 'choice-explicit' - when 3 then 'choice-implicit' - @branchingGroup = 'choice-explicit' if me.isAdmin() - application.tracker.identify branchingGroup: @branchingGroup unless me.isAdmin() - @branchingGroup - getGemPromptGroup: -> return @gemPromptGroup if @gemPromptGroup group = me.get('testGroupNumber') % 8 diff --git a/app/styles/play/level/modal/hero-victory-modal.sass b/app/styles/play/level/modal/hero-victory-modal.sass index 2ca7c5c2b..468bef75e 100644 --- a/app/styles/play/level/modal/hero-victory-modal.sass +++ b/app/styles/play/level/modal/hero-victory-modal.sass @@ -221,16 +221,6 @@ .last-submitted float: none - .next-levels-prompt - display: none - margin: 30px -21px - - .btn - width: 30% - width: -webkit-calc(33.333333% - 10px) - width: calc(33.333333% - 10px) - margin: 5px - .hour-of-code-done clear: both padding-top: 10px diff --git a/app/styles/play/world-map-view.sass b/app/styles/play/world-map-view.sass index 2e83f32bf..e4f81f0e7 100644 --- a/app/styles/play/world-map-view.sass +++ b/app/styles/play/world-map-view.sass @@ -231,7 +231,7 @@ $gameControlMargin: 30px font-size: 2vw text-shadow: 0 0 0.3vw white, 0 0 0.3vw white - &:hover + &:hover text-decoration: none &#forest-link @@ -240,9 +240,10 @@ $gameControlMargin: 30px transform: rotate(-35deg) &#dungeon-link - left: 13.01% - top: 58% + left: 9% + top: 54.5% transform: rotate(180deg) + color: fuchsia .game-controls position: absolute diff --git a/app/templates/play/level/modal/hero-victory-modal.jade b/app/templates/play/level/modal/hero-victory-modal.jade index f0d00ea4c..0537a7aee 100644 --- a/app/templates/play/level/modal/hero-victory-modal.jade +++ b/app/templates/play/level/modal/hero-victory-modal.jade @@ -42,11 +42,6 @@ block modal-body-content img(src=item.getPortraitURL()) .reward-text= animate ? 'New Item' : item.get('name') - .next-levels-prompt - for button in continueButtons - - var enabled = Boolean(button.link != '/play' || me.getBranchingGroup() == 'choice-implicit' || button.key == 'continue'); - button.btn.btn-success.btn-lg.world-map-button.next-level-branch-button(data-href=button.link, disabled=!enabled, data-dismiss="modal", data-i18n="play_level.victory_play_" + button[me.getBranchingGroup()], data-branch-key=button.key) - block modal-footer-content if me.get('anonymous') p.sign-up-poke.hide diff --git a/app/templates/play/modal/subscribe-modal.jade b/app/templates/play/modal/subscribe-modal.jade index 37681e8a1..ecf13ba2d 100644 --- a/app/templates/play/modal/subscribe-modal.jade +++ b/app/templates/play/modal/subscribe-modal.jade @@ -16,18 +16,17 @@ #selling-points #point-levels.point - .blurb(data-i18n="subscribe.levels") 25 more levels, with 5 new levels every week! + .blurb(data-i18n="subscribe.levels") #point-heroes.point - .blurb(data-i18n="subscribe.heroes") Unlock more heroes, including wizards and rangers! + .blurb(data-i18n="subscribe.heroes") #point-gems.point - .blurb(data-i18n="subscribe.gems") Subscribers get 3500 bonus gems per month! + .blurb(data-i18n="subscribe.gems") #point-items.point - .blurb(data-i18n="subscribe.items") Unlock the coding power of 275 new items! + .blurb(data-i18n="subscribe.items") #parents-info(data-i18n="subscribe.parents") button.btn.btn-lg.btn-illustrated.purchase-button(data-i18n="subscribe.subscribe_button") - span $9.99/mo - Subscribe if state === 'declined' #declined-alert.alert.alert-danger.alert-dismissible diff --git a/app/templates/play/world-map-view.jade b/app/templates/play/world-map-view.jade index 9390928d7..2a2538273 100644 --- a/app/templates/play/world-map-view.jade +++ b/app/templates/play/world-map-view.jade @@ -8,7 +8,7 @@ - var seenNext = nextLevel; each level in campaign.levels if !level.hidden - - var next = level.id == nextLevel || (!seenNext && levelStatusMap[level.id] != "complete" && !level.locked && !level.disabled && (!level.practice || me.getBranchingGroup() == 'all-practice')); + - var next = level.id == nextLevel || (!seenNext && levelStatusMap[level.id] != "complete" && !level.locked && !level.disabled); - seenNext = seenNext || next; div(style="left: #{level.x}%; bottom: #{level.y}%; background-color: #{level.color}", class="level" + (next ? " next" : "") + (level.disabled ? " disabled" : "") + (level.locked ? " locked" : "") + " " + levelStatusMap[level.id] || "", data-level-id=level.id, title=level.name + (level.disabled ? ' (Coming Soon to Adventurers)' : '')) a(href=level.type == 'hero' ? '#' : level.disabled ? "/play" : "/play/#{level.levelPath || 'level'}/#{level.id}", disabled=level.disabled, data-level-id=level.id, data-level-path=level.levelPath || 'level', data-level-name=level.name) @@ -73,15 +73,15 @@ button.btn.btn-lg.btn-inverse#volume-button(title="Adjust volume") .glyphicon.glyphicon-volume-down .glyphicon.glyphicon-volume-up -h1#campaign-status - if mapType == 'dungeon' - span.spr(data-i18n="play.campaign_dungeon") - else if mapType == 'forest' - span.spr(data-i18n="play.campaign_forest") - | - - if requiresSubscription - span.spl(data-i18n="play.subscription_required") - else if mapType == 'dungeon' - span.spl(data-i18n="play.free") - else - span.spl(data-i18n="play.subscribed") \ No newline at end of file +//h1#campaign-status +// if mapType == 'dungeon' +// span.spr(data-i18n="play.campaign_dungeon") +// else if mapType == 'forest' +// span.spr(data-i18n="play.campaign_forest") +// | - +// if requiresSubscription +// span.spl(data-i18n="play.subscription_required") +// else if mapType == 'dungeon' +// span.spl(data-i18n="play.free") +// else +// span.spl(data-i18n="play.subscribed") \ No newline at end of file diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index 90e8b05e2..f0c4d810c 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -82,6 +82,7 @@ module.exports = class WorldMapView extends RootView trackedHourOfCode = true @requiresSubscription = @terrain isnt 'dungeon' and not me.get('stripe')?.subscriptionID + @requiresSubscription = true destroy: -> @setupManager?.destroy() @@ -118,14 +119,6 @@ module.exports = class WorldMapView extends RootView @fullyRendered = true @render() @preloadTopHeroes() unless me.get('heroConfig')?.thangType - if @requiresSubscription - modal = if me.get('anonymous') then AuthModal else SubscribeModal - _.delay => - @openModalView? new modal() unless window.currentModal - if modal is SubscribeModal - window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'world map loadded' - window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics'] - , 2000 onSubscribed: -> @requiresSubscription = false @@ -144,9 +137,8 @@ module.exports = class WorldMapView extends RootView level.locked = false if me.get('slug') is 'nick' level.disabled = false if @levelStatusMap[level.id] in ['started', 'complete'] level.color = 'rgb(255, 80, 60)' - if level.practice - level.color = 'rgb(80, 130, 200)' unless me.getBranchingGroup() is 'all-practice' - level.hidden = true if me.getBranchingGroup() is 'no-practice' + if level.requiresSubscription + level.color = 'rgb(80, 130, 200)' context.levelStatusMap = @levelStatusMap context.levelPlayCountMap = @levelPlayCountMap context.isIPadApp = application.isIPadApp @@ -161,10 +153,16 @@ module.exports = class WorldMapView extends RootView @onWindowResize() unless application.isIPadApp _.defer => @$el?.find('.game-controls .btn').tooltip() # Have to defer or i18n doesn't take effect. - @$el.find('.level').tooltip() + @$el.find('.level').tooltip().each -> + return unless me.isAdmin() + $(@).draggable().on 'dragstop', -> + bg = $('.map-background') + x = ($(@).offset().left - bg.offset().left + $(@).outerWidth() / 2) / bg.width() + y = 1 - ($(@).offset().top - bg.offset().top + $(@).outerHeight() / 2) / bg.height() + console.log "#{$(@).data('level-id')}\n x: #{(100 * x).toFixed(2)}\n y: #{(100 * y).toFixed(2)}\n" @$el.addClass _.string.slugify @terrain @updateVolume() - unless window.currentModal or not @fullyRendered or @requiresSubscription + unless window.currentModal or not @fullyRendered @highlightElement '.level.next', delay: 500, duration: 60000, rotation: 0, sides: ['top'] if levelID = @$el.find('.level.next').data('level-id') @$levelInfo = @$el.find(".level-info-container[data-level-id=#{levelID}]").show() @@ -210,7 +208,7 @@ module.exports = class WorldMapView extends RootView @adjustLevelInfoPosition e @endHighlight() else - if @requiresSubscription and not @levelStatusMap[level.id] and not level.adventurer + if level.requiresSubscription and @requiresSubscription and not @levelStatusMap[level.id] and not level.adventurer modal = if me.get('anonymous') then AuthModal else SubscribeModal @openModalView new modal() if modal is SubscribeModal @@ -376,8 +374,8 @@ dungeon = [ id: 'shadow-guard' original: '54174347844506ae0195a0b8' description: 'Evade the Kithgard minion.' - x: 44 - y: 11 + x: 40.54 + y: 11.03 nextLevels: more_practice: 'kounter-kithwise' continue: 'forgetful-gemsmith' @@ -388,33 +386,34 @@ dungeon = [ id: 'kounter-kithwise' original: '54527a6257e83800009730c7' description: 'Practice your evasion skills with more guards.' - x: 55 - y: 11 + x: 35.37 + y: 20.61 + nextLevels: + continue: 'crawlways-of-kithgard' + practice: true + requiresSubscription: true + } + { + name: 'Crawlways of Kithgard' + type: 'hero' + id: 'crawlways-of-kithgard' + original: '545287ef57e83800009730d5' + description: 'Dart in and grab the gem–at the right moment.' + x: 36.48 + y: 29.03 nextLevels: - #more_practice: 'crawlways-of-kithgard' continue: 'forgetful-gemsmith' practice: true + requiresSubscription: true } - #{ - # name: 'Crawlways of Kithgard' - # type: 'hero' - # # id: 'crawlways-of-kithgard' - # original: '545287ef57e83800009730d5' - # description: 'Dart in and grab the gem–at the right moment.' - # x: 57 - # y: 12 - # nextLevels: - # continue: 'true-names' - # practice: true - #} { name: 'Forgetful Gemsmith' type: 'hero' id: 'forgetful-gemsmith' original: '544a98f62d002f0000fe331a' description: 'Grab even more gems as you practice moving.' - x: 66 - y: 11 + x: 54.98 + y: 10.53 nextLevels: continue: 'true-names' } @@ -424,8 +423,8 @@ dungeon = [ id: 'true-names' original: '541875da4c16460000ab990f' description: 'Learn an enemy\'s true name to defeat it.' - x: 76 - y: 13 + x: 68.44 + y: 10.70 nextLevels: more_practice: 'favorable-odds' continue: 'the-raised-sword' @@ -436,11 +435,12 @@ dungeon = [ id: 'favorable-odds' original: '5452972f57e83800009730de' description: 'Test out your battle skills by defeating more munchkins.' - x: 80.85 - y: 16 + x: 88.25 + y: 14.92 nextLevels: continue: 'the-raised-sword' practice: true + requiresSubscription: true } { name: 'The Raised Sword' @@ -448,23 +448,11 @@ dungeon = [ id: 'the-raised-sword' original: '5418aec24c16460000ab9aa6' description: 'Learn to equip yourself for combat.' - x: 85 - y: 20 + x: 81.51 + y: 17.92 nextLevels: continue: 'haunted-kithmaze' } - #{ - # name: 'The First Kithmaze' - # type: 'hero' - # id: 'the-first-kithmaze' - # original: '5418b9d64c16460000ab9ab4' - # description: 'The builders of Kithgard constructed many mazes to confuse travelers.' - # x: 78 - # y: 29 - # nextLevels: - # more_practice: 'descending-further' - # continue: 'the-second-kithmaze' - #} { name: 'Haunted Kithmaze' type: 'hero' @@ -477,17 +465,32 @@ dungeon = [ more_practice: 'descending-further' continue: 'the-second-kithmaze' } + { + name: 'Riddling Kithmaze' + type: 'hero' + id: 'riddling-kithmaze' + original: '5418b9d64c16460000ab9ab4' + description: 'If at first you go astray, change your loop to find the way.' + x: 69.97 + y: 28.03 + nextLevels: + more_practice: 'descending-further' + continue: 'the-second-kithmaze' + practice: true + requiresSubscription: true + } { name: 'Descending Further' type: 'hero' id: 'descending-further' original: '5452a84d57e83800009730e4' description: 'Another day, another maze.' - x: 70 - y: 28 + x: 61.68 + y: 22.80 nextLevels: continue: 'the-second-kithmaze' practice: true + requiresSubscription: true } { name: 'The Second Kithmaze' @@ -495,8 +498,8 @@ dungeon = [ id: 'the-second-kithmaze' original: '5418cf256bae62f707c7e1c3' description: 'Many have tried, few have found their way through this maze.' - x: 58 - y: 23 + x: 54.49 + y: 26.49 nextLevels: continue: 'dread-door' } @@ -506,8 +509,8 @@ dungeon = [ id: 'dread-door' original: '5418d40f4c16460000ab9ac2' description: 'Behind a dread door lies a chest full of riches.' - x: 59 - y: 32 + x: 60.52 + y: 33.70 nextLevels: continue: 'known-enemy' } @@ -562,11 +565,12 @@ dungeon = [ id: 'tactical-strike' original: '5452cfa706a59e000067e4f5' description: 'They\'re, uh, coming right for us! Sneak up behind them.' - x: 88.65 - y: 63.06 + x: 83.23 + y: 52.73 nextLevels: continue: 'the-final-kithmaze' practice: true + requiresSubscription: true } { name: 'The Final Kithmaze' @@ -574,8 +578,8 @@ dungeon = [ id: 'the-final-kithmaze' original: '541b434e1ccc8eaae19f3c33' description: 'To escape you must find your way through an Elder Kithman\'s maze.' - x: 83 - y: 68 + x: 86.95 + y: 64.70 nextLevels: more_practice: 'the-gauntlet' continue: 'kithgard-gates' @@ -586,11 +590,12 @@ dungeon = [ id: 'the-gauntlet' original: '5452d8b906a59e000067e4fa' description: 'Rush for the stairs, battling foes at every turn.' - x: 84.89 - y: 73.88 + x: 76.50 + y: 72.69 nextLevels: continue: 'kithgard-gates' practice: true + requiresSubscription: true } { name: 'Kithgard Gates' @@ -658,6 +663,8 @@ forest = [ continue: 'thornbush-farm' x: 33 y: 37 + practice: true + requiresSubscription: true } { name: 'Thornbush Farm' @@ -750,6 +757,7 @@ forest = [ continue: 'swift-dagger' x: 38 y: 72 + requiresSubscription: true } { name: 'Swift Dagger' @@ -761,6 +769,7 @@ forest = [ continue: 'shrapnel' x: 33 y: 72 + requiresSubscription: true } { name: 'Shrapnel' @@ -772,6 +781,7 @@ forest = [ continue: 'coinucopia' x: 28 y: 73 + requiresSubscription: true } # Wizard branch @@ -786,6 +796,7 @@ forest = [ x: 47 y: 71 adventurer: true + requiresSubscription: true } { name: 'Touch of Death' @@ -798,6 +809,7 @@ forest = [ x: 52 y: 70 adventurer: true + requiresSubscription: true } { name: 'Bonemender' @@ -810,6 +822,7 @@ forest = [ x: 58 y: 67 adventurer: true + requiresSubscription: true } { @@ -855,6 +868,7 @@ forest = [ continue: 'rich-forager' x: 74.5 y: 92 + requiresSubscription: true } { name: 'Rich Forager' @@ -867,6 +881,7 @@ forest = [ x: 80 y: 88 adventurer: true + requiresSubscription: true } { name: 'Siege of Stonehold' @@ -880,6 +895,7 @@ forest = [ x: 85.5 y: 83.5 adventurer: true + requiresSubscription: true } { name: 'Multiplayer Treasure Grove' diff --git a/app/views/play/level/modal/HeroVictoryModal.coffee b/app/views/play/level/modal/HeroVictoryModal.coffee index ba56c424c..7f4ac26a3 100644 --- a/app/views/play/level/modal/HeroVictoryModal.coffee +++ b/app/views/play/level/modal/HeroVictoryModal.coffee @@ -21,7 +21,6 @@ module.exports = class HeroVictoryModal extends ModalView events: 'click #continue-button': 'onClickContinue' - 'click .next-level-branch-button': 'onClickNextLevelBranch' 'click .return-to-ladder-button': 'onClickReturnToLadder' constructor: (options) -> @@ -110,13 +109,6 @@ module.exports = class HeroVictoryModal extends ModalView c.readyToRank = @level.get('type', true) is 'hero-ladder' and @session.readyToRank() c.level = @level @continueLevelLink = @getNextLevelLink 'continue' - @morePracticeLevelLink = @getNextLevelLink 'more_practice' - @skipAheadLevelLink = @getNextLevelLink 'skip_ahead' - c.continueButtons = [ - {key: 'skip_ahead', link: @skipAheadLevelLink, 'choice-explicit': 'skip', 'choice-implicit': 'too_easy'} - {key: 'continue', link: @continueLevelLink, 'choice-explicit': 'next_level', 'choice-implicit': 'just_right'} - {key: 'more_practice', link: @morePracticeLevelLink, 'choice-explicit': 'more_practice', 'choice-implicit': 'too_hard'} - ] elapsed = (new Date() - new Date(me.get('dateCreated'))) isHourOfCode = me.get('hourOfCode') or elapsed < 120 * 60 * 1000 @@ -290,34 +282,15 @@ module.exports = class HeroVictoryModal extends ModalView return link unless nextLevel = @getNextLevel type "#{link}?next=#{nextLevel}" - # Branching group testing - getNextLevel: (type) -> levelInfo = @getLevelInfoForSlug @level.get 'slug' - levelInfo?.nextLevels?[type] # 'more_practice', 'skip_ahead', 'continue' + levelInfo?.nextLevels?[type] # 'continue'; TODO: refactor to not have the object and just use single nextLevel property onClickContinue: (e) -> @playSound 'menu-button-click' nextLevelLink = @continueLevelLink - if me.getBranchingGroup() is 'all-practice' and @morePracticeLevelLink - nextLevelLink = @morePracticeLevelLink - skipPrompt = me.getBranchingGroup() in ['no-practice', 'all-practice'] - skipPrompt ||= not (@skipAheadLevelLink or @morePractiveLevelLink) and me.getBranchingGroup() is 'choice-explicit' - if skipPrompt - # Preserve the supermodel as we navigate back to the world map. - Backbone.Mediator.publish 'router:navigate', route: nextLevelLink, viewClass: require('views/play/WorldMapView'), viewArgs: [{supermodel: if @options.hasReceivedMemoryWarning then null else @supermodel}, @getNextLevelCampaign()] - else - # Hide everything except the buttons prompting them for which kind of next level to do - @$el.find('.modal-footer, .modal-body > *').hide() - @$el.find('.next-levels-prompt').show() - - onClickNextLevelBranch: (e) -> - @playSound 'menu-button-click' - e.preventDefault() - route = $(e.target).data('href') or "/play/#{@getNextLevelCampaign()}" - application.tracker?.trackEvent 'Branch Selected', level: @level.get('slug'), label: @level.get('slug'), branch: $(e.target).data('branch-key'), branchingGroup: me.getBranchingGroup(), route: route - # Preserve the supermodel as we navigate back to world map. - Backbone.Mediator.publish 'router:navigate', route: route, viewClass: require('views/play/WorldMapView'), viewArgs: [{supermodel: if @options.hasReceivedMemoryWarning then null else @supermodel}, @getNextLevelCampaign()] + # Preserve the supermodel as we navigate back to the world map. + Backbone.Mediator.publish 'router:navigate', route: nextLevelLink, viewClass: require('views/play/WorldMapView'), viewArgs: [{supermodel: if @options.hasReceivedMemoryWarning then null else @supermodel}, @getNextLevelCampaign()] onClickReturnToLadder: (e) -> @playSound 'menu-button-click' From e8bb5b824d228c3b09d4bdd37cadc93f9e230c2e Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Fri, 5 Dec 2014 15:49:38 -0800 Subject: [PATCH 32/32] Tweaked the subscription handler to modify the actual target user, not necessarily the user that is making the changes. --- server/payments/subscription_handler.coffee | 46 ++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/server/payments/subscription_handler.coffee b/server/payments/subscription_handler.coffee index fdf428873..636ab9b83 100644 --- a/server/payments/subscription_handler.coffee +++ b/server/payments/subscription_handler.coffee @@ -13,17 +13,17 @@ subscriptions = { } class SubscriptionHandler extends Handler - logSubscriptionError: (req, msg) -> - console.warn "Subscription Error: #{req.user.get('slug')} (#{req.user._id}): '#{msg}'" + logSubscriptionError: (user, msg) -> + console.warn "Subscription Error: #{user.get('slug')} (#{user._id}): '#{msg}'" subscribeUser: (req, user, done) -> - if (not req.user) or req.user.isAnonymous() + if (not req.user) or req.user.isAnonymous() or user.isAnonymous() return done({res: 'You must be signed in to subscribe.', code: 403}) token = req.body.stripe.token customerID = user.get('stripe')?.customerID if not (token or customerID) - @logSubscriptionError(req, 'Missing stripe token or customer ID.') + @logSubscriptionError(user, 'Missing stripe token or customer ID.') return done({res: 'Missing stripe token or customer ID.', code: 422}) if token @@ -31,15 +31,15 @@ class SubscriptionHandler extends Handler stripe.customers.update customerID, { card: token }, (err, customer) => if err or not customer # should not happen outside of test and production polluting each other - @logSubscriptionError(req, 'Cannot find customer: ', +customer.id + '\n\n' + err) + @logSubscriptionError(user, 'Cannot find customer: ', +customer.id + '\n\n' + err) return done({res: 'Cannot find customer.', code: 404}) @checkForExistingSubscription(req, user, customer, done) else newCustomer = { card: token - email: req.user.get('email') - metadata: { id: req.user._id + '', slug: req.user.get('slug') } + email: user.get('email') + metadata: { id: user._id + '', slug: user.get('slug') } } stripe.customers.create newCustomer, (err, customer) => @@ -47,22 +47,22 @@ class SubscriptionHandler extends Handler if err.type in ['StripeCardError', 'StripeInvalidRequestError'] return done({res: 'Card error', code: 402}) else - @logSubscriptionError(req, 'Stripe customer creation error. '+err) + @logSubscriptionError(user, 'Stripe customer creation error. '+err) return done({res: 'Database error.', code: 500}) - stripeInfo = _.cloneDeep(req.user.get('stripe') ? {}) + stripeInfo = _.cloneDeep(user.get('stripe') ? {}) stripeInfo.customerID = customer.id - req.user.set('stripe', stripeInfo) - req.user.save (err) => + user.set('stripe', stripeInfo) + user.save (err) => if err - @logSubscriptionError(req, 'Stripe customer id save db error. '+err) + @logSubscriptionError(user, 'Stripe customer id save db error. '+err) return done({res: 'Database error.', code: 500}) @checkForExistingSubscription(req, user, customer, done) else stripe.customers.retrieve(customerID, (err, customer) => if err - @logSubscriptionError(req, 'Stripe customer creation error. '+err) + @logSubscriptionError(user, 'Stripe customer creation error. '+err) return done({res: 'Database error.', code: 500}) @checkForExistingSubscription(req, user, customer, done) ) @@ -79,14 +79,14 @@ class SubscriptionHandler extends Handler # subscription a trial period that ends when the cancelled subscription would have ended. stripe.customers.cancelSubscription subscription.customer, subscription.id, (err) => if err - @logSubscriptionError(req, 'Stripe cancel subscription error. '+err) + @logSubscriptionError(user, 'Stripe cancel subscription error. '+err) return done({res: 'Database error.', code: 500}) options = { plan: 'basic', trial_end: subscription.current_period_end } options.coupon = couponID if couponID - stripe.customers.update req.user.get('stripe').customerID, options, (err, customer) => + stripe.customers.update user.get('stripe').customerID, options, (err, customer) => if err - @logSubscriptionError(req, 'Stripe customer plan setting error. '+err) + @logSubscriptionError(user, 'Stripe customer plan setting error. '+err) return done({res: 'Database error.', code: 500}) @updateUser(req, user, customer, false, done) @@ -98,9 +98,9 @@ class SubscriptionHandler extends Handler else options = { plan: 'basic' } options.coupon = couponID if couponID - stripe.customers.update req.user.get('stripe').customerID, options, (err, customer) => + stripe.customers.update user.get('stripe').customerID, options, (err, customer) => if err - @logSubscriptionError(req, 'Stripe customer plan setting error. '+err) + @logSubscriptionError(user, 'Stripe customer plan setting error. '+err) return done({res: 'Database error.', code: 500}) @updateUser(req, user, customer, true, done) @@ -123,25 +123,25 @@ class SubscriptionHandler extends Handler user.save (err) => if err - @logSubscriptionError(req, 'Stripe user plan saving error. '+err) + @logSubscriptionError(user, 'Stripe user plan saving error. '+err) return done({res: 'Database error.', code: 500}) - req.user?.saveActiveUser 'subscribe' + user?.saveActiveUser 'subscribe' return done() unsubscribeUser: (req, user, done) -> stripeInfo = _.cloneDeep(user.get('stripe')) stripe.customers.cancelSubscription stripeInfo.customerID, stripeInfo.subscriptionID, { at_period_end: true }, (err) => if err - @logSubscriptionError(req, 'Stripe cancel subscription error. '+err) + @logSubscriptionError(user, 'Stripe cancel subscription error. '+err) return done({res: 'Database error.', code: 500}) delete stripeInfo.planID user.set('stripe', stripeInfo) req.body.stripe = stripeInfo user.save (err) => if err - @logSubscriptionError(req, 'User save unsubscribe error. '+err) + @logSubscriptionError(user, 'User save unsubscribe error. '+err) return done({res: 'Database error.', code: 500}) - req.user?.saveActiveUser 'unsubscribe' + user?.saveActiveUser 'unsubscribe' return done() module.exports = new SubscriptionHandler()