Merged conflicts and fixed line endings windows => unix

app/locale/uk.coffee

@@ -478,36 +478,36 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
 
-#  contribute:
-#    page_title: "Contributing"
-#    character_classes_title: "Character Classes"
-#    introduction_desc_intro: "We have high hopes for 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 is totally open source"
-#    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_ending: "We hope you'll join our party!"
-#    introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen"
-#    alert_account_message_intro: "Hey there!"
-#    alert_account_message_pref: "To subscribe for class emails, you'll need to "
-#    alert_account_message_suf: "first."
-#    alert_account_message_create_url: "create an account"
-#    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."
+contribute:
+    page_title: "Співпраця"
+    character_classes_title: "Класи персонажів"
+    introduction_desc_intro: "Ми покладаємо великі надії на CodeCombat."
+    introduction_desc_pref: "Ми хочемо створити місце, де збиралися б програмісти найрізноманітніших спеціалізацій, абі вчитись та грати разом. Хочемо знайомити інших з неймовірним світом програмування та відображувати найкращі частини спільноти. Ми не можемо і не хочемо робити це самі, бо такі проекти, як  GitHub, Stack Overflow або Linux стали видатними саме завдяки людям, що використовують і будують їх. Через це"
+    introduction_desc_github_url: "код CodeCombat повністю вікдритий"
+    introduction_desc_suf: ", і ми пропонуємо вам усі можливі шляхи взяти участь у розробці й перетворити цей проект на не тільки наш. але й ваш теж."
+    introduction_desc_ending: "Сподіваємось, ви станете частиною нашої команди!"
+    introduction_desc_signature: "- Нік, Джордж, Скотт, Майкл, Джеремі та Глен"
+    alert_account_message_intro: "Привіт!"
+    alert_account_message_pref: "Щоб підписатися на е-мейли для вашого класу, потрібно"
+    alert_account_message_suf: "спершу."
+    alert_account_message_create_url: "створити акаунт"
+    archmage_summary: "Зацікавлений у роботі над ігровою графікою, дизайном інтерфейсу, організацією баз даних та серверу, мультиплеєром, фізокю, звуком або продукційністю ігрового движка? Мрієш допомогти у створенні гри, яка навчить інших того, у чому ви профі? У нас багато роботи, і якщо ти досвідчений програміст і хочеш розробляти CodeCombat, цей клас для тебе. Ми будемо щасливі бачити, як ти створюєш найкращу в світі гру для програмістів. "
 #    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."
-#    class_attributes: "Class Attributes"
+     class_attributes: "Ознаки класу"
 #    archmage_attribute_1_pref: "Knowledge 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."
-#    how_to_join: "How To Join"
-#    join_desc_1: "Anyone can help out! Just check out our "
-#    join_desc_2: "to get started, and check the box below to mark yourself as a brave Archmage and get the latest news by email. Want to chat about what to do or how to get more deeply involved? "
-#    join_desc_3: ", or find us in our "
-#    join_desc_4: "and we'll go from there!"
-#    join_url_email: "Email us"
-#    join_url_hipchat: "public HipChat room"
-#    more_about_archmage: "Learn More About Becoming an Archmage"
-#    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
+    how_to_join: "Як приєднатися"
+    join_desc_1: "Кожен може допомогти! Заходь на наш "
+    join_desc_2: ", щоб почати та постав позначку в чек-боксі нижче, щоб оголосити себе відважним архімагом та отримувати останні новини по е-мейл. Хочеш поспілкуватися про те, що саме робити й як включитися в роботу найглибше?"
+    join_desc_3: "або знайдіть нас у нашій "
+    join_desc_4: "- і ми вирішимо, з чого почати!"
+    join_url_email: "Напишіть нам"
+    join_url_hipchat: "публічній HipChat кімнаті"
+    more_about_archmage: "Дізнатися, як стати Архімагом"
+    archmage_subscribe_desc: "Отримувати листи з анонсами та новими можливостями для розробки."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: ", then this class is for you."
+    artisan_summary_suf: "тоді цей клас для тебе."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
 #    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
@@ -518,17 +518,17 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    artisan_join_step2: "Create a new level and explore existing levels."
 #    artisan_join_step3: "Find us in our public HipChat room for help."
 #    artisan_join_step4: "Post your levels on the forum for feedback."
-#    more_about_artisan: "Learn More About Becoming an Artisan"
-#    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
+    more_about_artisan: "Дізнатися, як стати Ремісником"
+    artisan_subscribe_desc: "Отримувати листи з анонсами та новинами про вдосконалення редактора рівнів."
 #    adventurer_summary: "Let us be clear about your role: you are the tank. You are going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class is for you."
 #    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
 #    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
 #    adventurer_attribute_2: "Charismatic. Be gentle but articulate about what needs improving, and offer suggestions on how to improve."
 #    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
-#    adventurer_forum_url: "our forum"
+    adventurer_forum_url: "наш форум"
 #    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    more_about_adventurer: "Learn More About Becoming an Adventurer"
-#    adventurer_subscribe_desc: "Get emails when there are new levels to test."
+    more_about_adventurer: "Дізнатися, як стати Шукачем пригод"
+    adventurer_subscribe_desc: "Отримувати листи, коли з'являються нові рівні для тестування."
 #    scribe_summary_pref: "CodeCombat is not just going to be a bunch of levels. It will also be a resource of programming knowledge that players can hook into. That way, each Artisan can link to a detailed article that for the player's edification: documentation akin to what the "
 #    scribe_summary_suf: " has built. If you enjoy explaining programming concepts, then this class is for you."
 #    scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
@@ -537,56 +537,56 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    scribe_attribute_1: "Skill in words is pretty much all you need. Not only grammar and spelling, but able to convey complicated ideas to others."
 #    contact_us_url: "Contact us"
 #    scribe_join_description: "tell us a little about yourself, your experience with programming and what sort of things you'd like to write about. We'll go from there!"
-#    more_about_scribe: "Learn More About Becoming a Scribe"
-#    scribe_subscribe_desc: "Get emails about article writing announcements."
+    more_about_scribe: "Дізнатися, як стати Писарем"
+    scribe_subscribe_desc: "Отрумивати листи з анонсами щодо написання статтей."
 #    diplomat_summary: "There is a large interest in CodeCombat in other countries that do not speak English! We are looking for translators who are willing to spend their time translating the site's corpus of words so that CodeCombat is accessible across the world as soon as possible. If you'd like to help getting CodeCombat international, then this class is for you."
 #    diplomat_introduction_pref: "So, if there's one thing we learned from the "
 #    diplomat_launch_url: "launch in October"
 #    diplomat_introduction_suf: "it's that there is sizeable interest in CodeCombat in other countries! We're building a corps of translators eager to turn one set of words into another set of words to get CodeCombat as accessible across the world as possible. If you like getting sneak peeks at upcoming content and getting these levels to your fellow nationals ASAP, then this class might be for you."
 #    diplomat_attribute_1: "Fluency in English and the language you would like to translate to. When conveying complicated ideas, it's important to have a strong grasp in both!"
 #    diplomat_join_pref_github: "Find your language locale file "
-#    diplomat_github_url: "on GitHub"
+    diplomat_github_url: "на GitHub"
 #    diplomat_join_suf_github: ", edit it online, and submit a pull request. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    more_about_diplomat: "Learn More About Becoming a Diplomat"
-#    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
+    more_about_diplomat: "Дізнатися, як стати Дипломатом"
+    diplomat_subscribe_desc: "Отримувати листи про розробки i18n та нові рівні для перекладу."
 #    ambassador_summary: "We are trying to build a community, and every community needs a support team when there are troubles. We have got chats, emails, and social networks so that our users can get acquainted with the game. If you want to help people get involved, have fun, and learn some programming, then this class is for you."
 #    ambassador_introduction: "This is a community we're building, and you are the connections. We've got Olark chats, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
 #    ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
 #    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
 #    ambassador_join_note_strong: "Note"
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-#    more_about_ambassador: "Learn More About Becoming an Ambassador"
-#    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
+    more_about_ambassador: "Дізнатися, як стати Посланцем"
+    ambassador_subscribe_desc: "Отримувати листи з новинами щодо підтримки користувачів та розробки мультиплеєра."
 #    counselor_summary: "None of the above roles fit what you are interested in? Do not worry, we are on the lookout for anybody who wants a hand in the development of CodeCombat! If you are interested in teaching, game development, open source management, or anything else that you think will be relevant to us, then this class is for you."
 #    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
 #    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
 #    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
 #    counselor_attribute_2: "A little bit of free time!"
 #    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
-#    more_about_counselor: "Learn More About Becoming a Counselor"
-#    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
-#    diligent_scribes: "Our Diligent Scribes:"
-#    powerful_archmages: "Our Powerful Archmages:"
-#    creative_artisans: "Our Creative Artisans:"
-#    brave_adventurers: "Our Brave Adventurers:"
-#    translating_diplomats: "Our Translating Diplomats:"
-#    helpful_ambassadors: "Our Helpful Ambassadors:"
+    more_about_counselor: "Дізнатися, як стати Радником"
+    changes_auto_save: "Зміни зберігаються автоматично, коли ви ставите позначку у чекбоксі."
+    diligent_scribes: "Наші старанні Писарі:"
+    powerful_archmages: "Наші могутні Архімаги:"
+    creative_artisans: "Наші талановиті Ремісники:"
+    brave_adventurers: "Наші хоробрі Шукачі пригод:"
+    translating_diplomats: "Наші перекладачі - Дипломати:"
+    helpful_ambassadors: "Наші незамінні Посланці:"
 
-#  classes:
-#    archmage_title: "Archmage"
-#    archmage_title_description: "(Coder)"
-#    artisan_title: "Artisan"
-#    artisan_title_description: "(Level Builder)"
-#    adventurer_title: "Adventurer"
-#    adventurer_title_description: "(Level Playtester)"
-#    scribe_title: "Scribe"
-#    scribe_title_description: "(Article Editor)"
-#    diplomat_title: "Diplomat"
-#    diplomat_title_description: "(Translator)"
-#    ambassador_title: "Ambassador"
-#    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
+  classes:
+    archmage_title: "Архімаг"
+    archmage_title_description: "(Програміст)"
+    artisan_title: "Ремісник"
+    artisan_title_description: "(Створювач рівнів)"
+    adventurer_title: "Шукач пригод"
+    adventurer_title_description: "(Тестувальник рівнів)"
+    scribe_title: "Писар"
+    scribe_title_description: "(Редактор статей)"
+    diplomat_title: "Дипломат"
+    diplomat_title_description: "(Перекладач)"
+    ambassador_title: "Посланець"
+    ambassador_title_description: "(Підтримка)"
+    counselor_title: "Радник"
+    counselor_title_description: "(Експерт/Вчитель)"
 
 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."