diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee
index 0ad255343..ef6adecb3 100644
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@@ -1,12 +1,16 @@
 module.exports = nativeDescription: "български език", englishDescription: "Bulgarian", translation:
   home:
-    slogan: "Научи се да програмираш, докато играеш игра "
+    slogan: "Научи се да програмираш, докато играеш"
     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
+    no_mobile: "CodeCombat не е направен за мобилни устройства и може да не работи с тях!" # Warning that shows up on mobile devices
     play: "Играй" # The big play button that opens up the campaign view.
     old_browser: "О, не! Браузърът ти е твърде стар за CodeCombat. Съжалявам!" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "Все пак можеш да опиваш, но най-вероятно няма да проработи."
+<<<<<<< HEAD
+    ipad_browser: "Лошa новинa: CodeCombat не работи в браузъра на iPad. Добра новина: Приложението ни за iPad изчаква одобрение от Apple."
+=======
 #    ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval."
+>>>>>>> upstream/master
     campaign: "Кампания"
     for_beginners: "За начинаещи"
 #    multiplayer: "Multiplayer" # Not currently shown on home page
@@ -15,15 +19,15 @@ module.exports = nativeDescription: "български език", englishDescri
 
   nav:
     play: "Нива" # The top nav bar entry where players choose which levels to play
-    community: "Обшност"
+    community: "Общност"
     editor: "Редактор"
     blog: "Блог"
     forum: "Форум"
-    account: "Сметката"
+    account: "Акаунт"
     profile: "Профил"
     stats: "Статистики"
-#    code: "Code"
-#    admin: "Admin" # Only shows up when you are an admin
+    code: "Код"
+    admin: "Администратор" # Only shows up when you are an admin
     home: "Начало"
     contribute: "Допринеси"
 #    legal: "Legal"
@@ -58,9 +62,13 @@ module.exports = nativeDescription: "български език", englishDescri
     owned: "Придобити" # For items you own
     locked: "Заключено"
 #    purchasable: "Purchasable" # For a hero you unlocked but haven't purchased
-#    available: "Available"
+    available: "Достъпен"
 #    skills_granted: "Skills Granted" # Property documentation details
+<<<<<<< HEAD
+    heroes: "Герои" # Tooltip on hero shop button from /play
+=======
 #    heroes: "Heroes" # Tooltip on hero shop button from /play
+>>>>>>> upstream/master
     achievements: "Постижения" # Tooltip on achievement list button from /play
     account: "Акаунт" # Tooltip on account button from /play
     settings: "Настройки" # Tooltip on settings button from /play
@@ -69,7 +77,11 @@ module.exports = nativeDescription: "български език", englishDescri
 #    choose_inventory: "Equip Items"
     buy_gems: "Купи скъпоценни камъни"
     subscription_required: "Нужен е абонамент"
+<<<<<<< HEAD
+    older_campaigns: "Предишни кампании"
+=======
     older_campaigns: "Предишни капмании"
+>>>>>>> upstream/master
     anonymous: "Анонимен играч"
     level_difficulty: "Трудност"
     campaign_beginner: "Кампания за начинаещи"
@@ -92,8 +104,13 @@ module.exports = nativeDescription: "български език", englishDescri
     campaign_classic_algorithms: "Класически алгоритми"
 #    campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science."
 
+<<<<<<< HEAD
+#  share_progress_modal:
+    blurb: "Справяш се чудесно! Сподели с някого,колко много научи чрез CodeCombat."
+=======
   share_progress_modal:
 #    blurb: "You’re making great progress! Tell someone how much you've learned with CodeCombat."
+>>>>>>> upstream/master
     email_invalid: "Имейл адресът е невалиден"
 #    form_blurb: "Enter their email below and we’ll show them!"
     form_label: "Електронна поща"
@@ -114,7 +131,11 @@ module.exports = nativeDescription: "български език", englishDescri
 #    finishing: "Finishing"
     sign_in_with_facebook: "Вписване чрез Facebook"
     sign_in_with_gplus: "Вписване чрез G+"
+<<<<<<< HEAD
+    signup_switch: "Създаване на нов акаунт?"
+=======
 #    signup_switch: "Want to create an account?"
+>>>>>>> upstream/master
 
   signup:
     email_announcements: "Получава анонси по имейл"
@@ -123,7 +144,7 @@ module.exports = nativeDescription: "български език", englishDescri
     log_in: "Вход с парола"
     social_signup: "Или, можеш да се регистрираш през Facebook или G+:"
     required: "Трабва да влезеш преди можеш да ходиш на там."
-#    login_switch: "Already have an account?"
+    login_switch: "Вече имаш акаунт?"
 
   recover:
     recover_account_title: "Възстанови Акаунт"
@@ -139,8 +160,8 @@ module.exports = nativeDescription: "български език", englishDescri
 #    books: "Books"
 
   common:
-#    back: "Back" # When used as an action verb, like "Navigate backward"
-#    continue: "Continue" # When used as an action verb, like "Continue forward"
+    back: "Назад" # When used as an action verb, like "Navigate backward"
+    continue: "Продължи" # When used as an action verb, like "Continue forward"
     loading: "Зареждане..."
     saving: "Записване..."
     sending: "Изпращане..."
@@ -149,17 +170,17 @@ module.exports = nativeDescription: "български език", englishDescri
     save: "Запис"
     publish: "Публикувай"
     create: "Създай"
-#    manual: "Manual"
+    manual: "Ръчно"
 #    fork: "Fork"
-#    play: "Play" # When used as an action verb, like "Play next level"
-#    retry: "Retry"
-#    actions: "Actions"
-#    info: "Info"
-#    help: "Help"
-#    watch: "Watch"
-#    unwatch: "Unwatch"
-#    submit_patch: "Submit Patch"
-#    submit_changes: "Submit Changes"
+    play: "Играй" # When used as an action verb, like "Play next level"
+    retry: "Отново"
+    actions: "Действия"
+    info: "Инфо"
+    help: "Помощ"
+    watch: "Наблюдавай"
+    unwatch: "Не наблюдавай"
+    submit_patch: "Предложи кръпка"
+    submit_changes: "Предложи промените"
 
   general:
     and: "и"
@@ -167,47 +188,47 @@ module.exports = nativeDescription: "български език", englishDescri
     date: "Дата"
 #    body: "Body"
     version: "Версия"
-#    pending: "Pending"
-#    accepted: "Accepted"
-#    rejected: "Rejected"
+    pending: "Изчакващ"
+    accepted: "Прието"
+    rejected: "Отказано"
 #    withdrawn: "Withdrawn"
 #    submitter: "Submitter"
 #    submitted: "Submitted"
 #    commit_msg: "Commit Message"
-#    review: "Review"
+    review: "Преглед"
     version_history: "Предишни версии"
-#    version_history_for: "Version History for: "
-#    select_changes: "Select two changes below to see the difference."
+    version_history_for: "Предишни версии на: "
+    select_changes: "Избери две промени за да видиш разликата между тях."
 #    undo_prefix: "Undo"
 #    undo_shortcut: "(Ctrl+Z)"
 #    redo_prefix: "Redo"
 #    redo_shortcut: "(Ctrl+Shift+Z)"
 #    play_preview: "Play preview of current level"
-#    result: "Result"
+    result: "Резултат"
     results: "Резултати"
     description: "Описание"
     or: "или"
-#    subject: "Subject"
+    subject: "Тема"
     email: "Email"
     password: "Парола"
     message: "Съобщение"
-#    code: "Code"
+    code: "Код"
 #    ladder: "Ladder"
 #    when: "When"
-#    opponent: "Opponent"
+    opponent: "Опонент"
 #    rank: "Rank"
-#    score: "Score"
-#    win: "Win"
-#    loss: "Loss"
+    score: "Точки"
+    win: "Победа"
+    loss: "Загуба"
 #    tie: "Tie"
-#    easy: "Easy"
-#    medium: "Medium"
-#    hard: "Hard"
-#    player: "Player"
-#    player_level: "Level" # Like player level 5, not like level: Dungeons of Kithgard
-#    warrior: "Warrior"
+    easy: "Лесно"
+    medium: "Средно"
+    hard: "Трудно"
+    player: "Играч"
+    player_level: "Ниво" # Like player level 5, not like level: Dungeons of Kithgard
+    warrior: "Боец"
 #    ranger: "Ranger"
-#    wizard: "Wizard"
+    wizard: "Магьосник"
 
   units:
     second: "секунда"
@@ -228,42 +249,42 @@ module.exports = nativeDescription: "български език", englishDescri
   play_level:
     done: "Готово"
 #    home: "Home" # Not used any more, will be removed soon.
-#    level: "Level" # Like "Level: Dungeons of Kithgard"
-#    skip: "Skip"
-#    game_menu: "Game Menu"
-#    guide: "Guide"
-#    restart: "Restart"
-#    goals: "Goals"
-#    goal: "Goal"
+    level: "Ниво" # Like "Level: Dungeons of Kithgard"
+    skip: "Прескочи"
+    game_menu: "Главно Меню"
+    guide: "Упътване"
+    restart: "Рестарт"
+    goals: "Цели"
+    goal: "Цел"
 #    running: "Running..."
-#    success: "Success!"
-#    incomplete: "Incomplete"
+    success: "Успех!"
+    incomplete: "Недовършен"
 #    timed_out: "Ran out of time"
 #    failing: "Failing"
 #    action_timeline: "Action Timeline"
 #    click_to_select: "Click on a unit to select it."
 #    control_bar_multiplayer: "Multiplayer"
-#    control_bar_join_game: "Join Game"
-#    reload: "Reload"
-#    reload_title: "Reload All Code?"
+    control_bar_join_game: "Присъединяване"
+    reload: "Презареди"
+    reload_title: "Презареди целият код?"
 #    reload_really: "Are you sure you want to reload this level back to the beginning?"
-#    reload_confirm: "Reload All"
-#    victory: "Victory"
+    reload_confirm: "Презареди всички"
+    victory: "Победа"
 #    victory_title_prefix: ""
 #    victory_title_suffix: " Complete"
-#    victory_sign_up: "Sign Up to Save Progress"
+    victory_sign_up: "Регистрирай се за да запишеш напредъка си"
 #    victory_sign_up_poke: "Want to save your code? Create a free account!"
 #    victory_rate_the_level: "Rate the level: " # Only in old-style levels.
 #    victory_return_to_ladder: "Return to Ladder"
-#    victory_play_continue: "Continue"
-#    victory_saving_progress: "Saving Progress"
+    victory_play_continue: "Продължи"
+    victory_saving_progress: "Записване на напредъка"
 #    victory_go_home: "Go Home" # Only in old-style levels.
 #    victory_review: "Tell us more!" # Only in old-style levels.
-#    victory_hour_of_code_done: "Are You Done?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
-#    victory_experience_gained: "XP Gained"
-#    victory_gems_gained: "Gems Gained"
-#    guide_title: "Guide"
+    victory_hour_of_code_done: "Готов ли си?"
+    victory_hour_of_code_done_yes: "Да аз съм готов с моят Hour of Code™!"
+    victory_experience_gained: "Спечелен опит"
+    victory_gems_gained: "Спечелени скъпоценни камъни"
+    guide_title: "Упътване"
 #    tome_minion_spells: "Your Minions' Spells" # Only in old-style levels.
 #    tome_read_only_spells: "Read-Only Spells" # Only in old-style levels.
 #    tome_other_units: "Other Units" # Only in old-style levels.
@@ -276,29 +297,29 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methdos).
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
-#    tome_your_skills: "Your Skills"
-#    tome_help: "Help"
+    tome_your_skills: "Твоите Умения"
+    tome_help: "Помощ"
 #    tome_current_method: "Current Method"
-#    hud_continue_short: "Continue"
-#    code_saved: "Code Saved"
-#    skip_tutorial: "Skip (esc)"
-#    keyboard_shortcuts: "Key Shortcuts"
-#    loading_ready: "Ready!"
-#    loading_start: "Start Level"
-#    problem_alert_title: "Fix Your Code"
-#    problem_alert_help: "Help"
-#    time_current: "Now:"
+    hud_continue_short: "Продължи"
+    code_saved: "Кодът е записан"
+    skip_tutorial: "Пропусни (esc)"
+    keyboard_shortcuts: "Клавишни комбинации"
+    loading_ready: "Готово!"
+    loading_start: "Стартирай Ниво"
+    problem_alert_title: "Оправи си кода."
+    problem_alert_help: "Помощ"
+    time_current: "Текущо време:"
 #    time_total: "Max:"
 #    time_goto: "Go to:"
-#    infinite_loop_try_again: "Try Again"
-#    infinite_loop_reset_level: "Reset Level"
-#    infinite_loop_comment_out: "Comment Out My Code"
+    infinite_loop_try_again: "Пробвай отново"
+    infinite_loop_reset_level: "Ресетване на Ниво"
+    infinite_loop_comment_out: "Коментирай моят Код"
 #    tip_toggle_play: "Toggle play/paused with Ctrl+P."
 #    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
 #    tip_guide_exists: "Click the guide, inside game menu (at the top of the page), for useful info."
-#    tip_open_source: "CodeCombat is 100% open source!"
+    tip_open_source: "CodeCombat e 100% проект с отворен код!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
-#    tip_think_solution: "Think of the solution, not the problem."
+    tip_think_solution: "Помисли върху решението,не проблема."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
@@ -339,35 +360,35 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
 
 #  game_menu:
-#    inventory_tab: "Inventory"
-#    save_load_tab: "Save/Load"
-#    options_tab: "Options"
-#    guide_tab: "Guide"
-#    guide_video_tutorial: "Video Tutorial"
-#    guide_tips: "Tips"
+    inventory_tab: "Инвентар"
+    save_load_tab: "Запиши/Зареди"
+    options_tab: "Настройки"
+    guide_tab: "Упътване"
+    guide_video_tutorial: "Видео Упътване"
+    guide_tips: "Съвети"
 #    multiplayer_tab: "Multiplayer"
-#    auth_tab: "Sign Up"
+    auth_tab: "Записване"
 #    inventory_caption: "Equip your hero"
-#    choose_hero_caption: "Choose hero, language"
+    choose_hero_caption: "Избери герой, език"
 #    save_load_caption: "... and view history"
-#    options_caption: "Configure settings"
+    options_caption: "Промени настройките"
 #    guide_caption: "Docs and tips"
-#    multiplayer_caption: "Play with friends!"
-#    auth_caption: "Save your progress."
+    multiplayer_caption: "Играй с приятели!"
+    auth_caption: "Запиши напредъка си."
 
 #  leaderboard:
 #    leaderboard: "Leaderboard"
-#    view_other_solutions: "View Other Solutions"
-#    scores: "Scores"
-#    top_players: "Top Players by"
-#    day: "Today"
-#    week: "This Week"
-#    all: "All-Time"
-#    time: "Time"
-#    damage_taken: "Damage Taken"
-#    damage_dealt: "Damage Dealt"
-#    difficulty: "Difficulty"
-#    gold_collected: "Gold Collected"
+    view_other_solutions: "Виж други решения"
+    scores: "Точки"
+    top_players: "ТОП играчи според"
+    day: "Днес"
+    week: "Тази седмица"
+    all: "От самото начало"
+    time: "Време"
+    damage_taken: "Поети щети"
+    damage_dealt: "Нанесени щети"
+    difficulty: "Трудност"
+    gold_collected: "Събрано Злато"
 
 #  inventory:
 #    choose_inventory: "Equip Items"
@@ -383,14 +404,14 @@ module.exports = nativeDescription: "български език", englishDescri
 #    unequip: "Unequip"
 
 #  buy_gems:
-#    few_gems: "A few gems"
-#    pile_gems: "Pile of gems"
-#    chest_gems: "Chest of gems"
-#    purchasing: "Purchasing..."
-#    declined: "Your card was declined"
-#    retrying: "Server error, retrying."
-#    prompt_title: "Not Enough Gems"
-#    prompt_body: "Do you want to get more?"
+    few_gems: "Няколко скъпоценни камъни"
+    pile_gems: "Купчина скъпоценни камъни"
+    chest_gems: "Сандък със скъпоценни камъни"
+    purchasing: "Купуване..."
+    declined: "Картата ви беше отказана."
+    retrying: "Грешка в сървъра, пробвам отново."
+    prompt_title: "Недостатъчно скъпоценни камъни"
+    prompt_body: "Искате ли още?"
 #    prompt_button: "Enter Shop"
 #    recovered: "Previous gems purchase recovered. Please refresh the page."
 #    or_subscribe: "Or 3500 gems/mo if you..."