Merge pull request #21129 from code-dot-org/dtp_candidate_02b63ef1

DTP (Test > Production: 02b63ef)
code-dot-org · Mar 8, 2018 · 28b82a7 · 28b82a7
2 parents 97d69d4 + 81a83f3
commit 28b82a7
Show file tree

Hide file tree

Showing 1,762 changed files with 6,540 additions and 4,734 deletions.
diff --git a/SETUP.md b/SETUP.md
@@ -15,7 +15,7 @@ You can do Code.org development using OSX, Ubuntu, or Windows (running Ubuntu in
      npm --version   # --> 3.10.8
      yarn -V         # --> 0.23.2
      ```
-1. `git clone https://github.com/code-dot-org/code-dot-org.git`
+1. If using HTTPS: `git clone https://github.com/code-dot-org/code-dot-org.git`, if using SSH: `git@github.com:code-dot-org/code-dot-org.git`
 1. `gem install bundler`
 1. `rbenv rehash`
 1. `cd code-dot-org`

diff --git a/apps/i18n/bounce/de_de.json b/apps/i18n/bounce/de_de.json
diff --git a/apps/i18n/bounce/sq_al.json b/apps/i18n/bounce/sq_al.json
diff --git a/apps/i18n/common/ar_sa.json b/apps/i18n/common/ar_sa.json
diff --git a/apps/i18n/common/az_az.json b/apps/i18n/common/az_az.json
diff --git a/apps/i18n/common/bg_bg.json b/apps/i18n/common/bg_bg.json
diff --git a/apps/i18n/common/bn_bd.json b/apps/i18n/common/bn_bd.json
diff --git a/apps/i18n/common/bs_ba.json b/apps/i18n/common/bs_ba.json
diff --git a/apps/i18n/common/ca_es.json b/apps/i18n/common/ca_es.json
diff --git a/apps/i18n/common/co_co.json b/apps/i18n/common/co_co.json
diff --git a/apps/i18n/common/cs_cz.json b/apps/i18n/common/cs_cz.json
diff --git a/apps/i18n/common/da_dk.json b/apps/i18n/common/da_dk.json
diff --git a/apps/i18n/common/de_de.json b/apps/i18n/common/de_de.json
diff --git a/apps/i18n/common/el_gr.json b/apps/i18n/common/el_gr.json
diff --git a/apps/i18n/common/en_gb.json b/apps/i18n/common/en_gb.json
diff --git a/apps/i18n/common/en_us.json b/apps/i18n/common/en_us.json
@@ -636,6 +636,7 @@
   "myCourses": "My Courses",
   "myProjects": "My Projects",
   "name": "Name",
+  "nameRequired": "Student name (required)",
   "nestedForSameVariable": "You're using the same variable inside two or more nested loops. Use unique variable names to avoid infinite loops.",
   "newPassword": "new password",
   "newSection": "New section",
@@ -778,7 +779,7 @@
   "projectsViewAll": "View all projects",
   "projectsViewProjectGallery": "View projects",
   "projects": "Projects",
-  "projectsSubHeading": "Over 20 million projects created",
+  "projectsSubHeading": "Over 24 million projects created",
   "print": "Print",
   "privacyPolicy": "Privacy Policy",
   "projectGalleryCard": "Project Gallery",
@@ -818,7 +819,6 @@
   "repeat": "repeat",
   "replayButton": "Replay",
   "reportAbuse": "Report Abuse",
-  "required": "required",
   "reset": "Reset",
   "resetProgram": "Reset",
   "resetPassword": "Reset password",

diff --git a/apps/i18n/common/es_es.json b/apps/i18n/common/es_es.json
diff --git a/apps/i18n/common/es_mx.json b/apps/i18n/common/es_mx.json
diff --git a/apps/i18n/common/et_ee.json b/apps/i18n/common/et_ee.json
diff --git a/apps/i18n/common/eu_es.json b/apps/i18n/common/eu_es.json
diff --git a/apps/i18n/common/fa_af.json b/apps/i18n/common/fa_af.json
diff --git a/apps/i18n/common/fa_ir.json b/apps/i18n/common/fa_ir.json
diff --git a/apps/i18n/common/fi_fi.json b/apps/i18n/common/fi_fi.json
diff --git a/apps/i18n/common/fil_ph.json b/apps/i18n/common/fil_ph.json
diff --git a/apps/i18n/common/fr_fr.json b/apps/i18n/common/fr_fr.json
diff --git a/apps/i18n/common/ga_ie.json b/apps/i18n/common/ga_ie.json
diff --git a/apps/i18n/common/gl_es.json b/apps/i18n/common/gl_es.json
diff --git a/apps/i18n/common/haw_hi.json b/apps/i18n/common/haw_hi.json
diff --git a/apps/i18n/common/he_il.json b/apps/i18n/common/he_il.json
diff --git a/apps/i18n/common/hi_in.json b/apps/i18n/common/hi_in.json
diff --git a/apps/i18n/common/hr_hr.json b/apps/i18n/common/hr_hr.json
diff --git a/apps/i18n/common/hu_hu.json b/apps/i18n/common/hu_hu.json
diff --git a/apps/i18n/common/hy_am.json b/apps/i18n/common/hy_am.json
diff --git a/apps/i18n/common/id_id.json b/apps/i18n/common/id_id.json
diff --git a/apps/i18n/common/is_is.json b/apps/i18n/common/is_is.json
diff --git a/apps/i18n/common/it_it.json b/apps/i18n/common/it_it.json
diff --git a/apps/i18n/common/ja_jp.json b/apps/i18n/common/ja_jp.json
diff --git a/apps/i18n/common/ka_ge.json b/apps/i18n/common/ka_ge.json
diff --git a/apps/i18n/common/kk_kz.json b/apps/i18n/common/kk_kz.json
diff --git a/apps/i18n/common/ko_kr.json b/apps/i18n/common/ko_kr.json
diff --git a/apps/i18n/common/ku_iq.json b/apps/i18n/common/ku_iq.json
diff --git a/apps/i18n/common/ky_kg.json b/apps/i18n/common/ky_kg.json
diff --git a/apps/i18n/common/lt_lt.json b/apps/i18n/common/lt_lt.json
diff --git a/apps/i18n/common/lv_lv.json b/apps/i18n/common/lv_lv.json
diff --git a/apps/i18n/common/mi_nz.json b/apps/i18n/common/mi_nz.json
diff --git a/apps/i18n/common/mk_mk.json b/apps/i18n/common/mk_mk.json
diff --git a/apps/i18n/common/mr_in.json b/apps/i18n/common/mr_in.json
diff --git a/apps/i18n/common/ms_my.json b/apps/i18n/common/ms_my.json
diff --git a/apps/i18n/common/mt_mt.json b/apps/i18n/common/mt_mt.json
diff --git a/apps/i18n/common/my_mm.json b/apps/i18n/common/my_mm.json
diff --git a/apps/i18n/common/ne_np.json b/apps/i18n/common/ne_np.json
diff --git a/apps/i18n/common/nl_nl.json b/apps/i18n/common/nl_nl.json
diff --git a/apps/i18n/common/nn_no.json b/apps/i18n/common/nn_no.json
diff --git a/apps/i18n/common/no_no.json b/apps/i18n/common/no_no.json
diff --git a/apps/i18n/common/pl_pl.json b/apps/i18n/common/pl_pl.json
diff --git a/apps/i18n/common/ps_af.json b/apps/i18n/common/ps_af.json
diff --git a/apps/i18n/common/pt_br.json b/apps/i18n/common/pt_br.json
diff --git a/apps/i18n/common/pt_pt.json b/apps/i18n/common/pt_pt.json
diff --git a/apps/i18n/common/ro_ro.json b/apps/i18n/common/ro_ro.json
diff --git a/apps/i18n/common/ru_ru.json b/apps/i18n/common/ru_ru.json
diff --git a/apps/i18n/common/se_fi.json b/apps/i18n/common/se_fi.json
diff --git a/apps/i18n/common/si_lk.json b/apps/i18n/common/si_lk.json
diff --git a/apps/i18n/common/sk_sk.json b/apps/i18n/common/sk_sk.json