Merge remote-tracking branch 'upstream/master'

app/locale/en.coffee

@@ -678,6 +678,7 @@
     cla_url: "CLA"
     cla_suffix: "."
     cla_agree: "I AGREE"
+    owner_approve: "An owner will need to approve it before your changes will become visible."
 
   contact:
     contact_us: "Contact CodeCombat"
@@ -714,8 +715,8 @@
     admin: "Admin"
     new_password: "New Password"
     new_password_verify: "Verify"
-    type_in_email: "Type in your email to confirm account deletion."
-    type_in_password: "Also, type in your password."
+    type_in_email: "Type in your email to confirm account deletion." # {change}
+    type_in_password: "Also, type in your password." # {change}
     email_subscriptions: "Email Subscriptions"
     email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Announcements"
@@ -926,6 +927,8 @@
     pop_i18n: "Populate I18N"
     tasks: "Tasks"
     clear_storage: "Clear your local changes"
+    add_system_title: "Add Systems to Level"
+    done_adding: "Done Adding"
 
   article:
     edit_btn_preview: "Preview"

app/locale/ru.coffee

@@ -713,7 +713,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     admin: "Админ"
     new_password: "Новый пароль"
     new_password_verify: "Подтверждение пароля"
-    type_in_email: "Введите ваш email для подтверждения удаления"
+    type_in_email: "Введите ваш email для подтверждения удаления аккаунта"
     type_in_password: "Так же введите ваш пароль"
     email_subscriptions: "Email-подписки"
     email_subscriptions_none: "Нет активных подписок."

app/templates/editor/level/system/add.jade

@@ -6,5 +6,5 @@ block modal-header-content
 block modal-body-content
   ul.available-systems-list
 
-block modal-footer-content  
-  button.btn.btn-primary(data-dismiss="modal") Done Adding
+block modal-footer-content
+  button.btn.btn-primary(data-dismiss="modal", data-i18n="editor.done_adding") Done Adding

app/templates/editor/modal/save-version-modal.jade

@@ -18,7 +18,7 @@ block modal-body-content
             input#major-version(name="version-is-major", type="checkbox")
             span(data-i18n="versions.new_major_version") New Major Version
   else
-    .alert.alert-danger No changes
+    .alert.alert-danger(data-i18n="delta.no_changes") No changes
 
 block modal-body-wait-content
   if hasChanges
@@ -30,13 +30,12 @@ block modal-body-wait-content
 block modal-footer-content
   if hasChanges
     #accept-cla-wrapper.alert.alert-info
-      span(data-i18n="versions.cla_prefix") To save changes, first you must agree to our
-      |  
+      span.spr(data-i18n="versions.cla_prefix") To save changes, first you must agree to our
       strong#cla-link(data-i18n="versions.cla_url") CLA
       span(data-i18n="versions.cla_suffix") .
       button.btn.btn-sm#agreement-button(data-i18n="versions.cla_agree") I AGREE
     if isPatch
-      .alert.alert-info An owner will need to approve it before your changes will become visible.
+      .alert.alert-info(data-i18n="versions.owner_approve") An owner will need to approve it before your changes will become visible.
 
   .buttons
     button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel

app/templates/play/menu/guide-view.jade

@@ -30,10 +30,6 @@ if docs.length === 1
         strong
           a(class="resource-link", data-resource="code-school", href='http://mbsy.co/bVRsR') Code School
         | : Learn web technologies with video lessons, coding challenges, and screencasts.
-      li
-        strong
-          a(class="resource-link", data-resource="learnable", href='http://shrsl.com/?~80my') Learnable
-        | : Learn web design, HTML, CSS, and so much more.
       li
         strong
           a(class="resource-link", data-resource="pluralsight", href='http://shrsl.com/?~81i5') Pluralsight

app/templates/play/modal/play-account-modal.jade

@@ -7,4 +7,4 @@ block modal-body-content
   #account-settings-view
 
 block modal-footer-content
-  #save-button.btn-lg.btn.disabled(data-i18n="general.save" disabled="true") No Changes
+  #save-button.btn-lg.btn.disabled(data-i18n="delta.no_changes" disabled="true") No Changes

server/routes/mail.coffee

@@ -730,7 +730,7 @@ sendNextStepsEmail = (user, now, daysAgo) ->
         #'mv-code-club': isKid  # TODO: geodetect, get landing page URL
         'breakout-mentors': isKid
       nAdditionalOffers = Math.max 0, 4 - _.filter(offers).length
-      possibleAdditionalOffers = ['ostraining', 'code-school', 'one-month', 'learnable', 'pluralsight']
+      possibleAdditionalOffers = ['ostraining', 'code-school', 'one-month', 'pluralsight']
       for offer in _.sample possibleAdditionalOffers, nAdditionalOffers
         offers[offer] = true
       if user.isPremium()