diff --git a/readthedocs/locale/en/LC_MESSAGES/django.mo b/readthedocs/locale/en/LC_MESSAGES/django.mo
index f09984ff896..6c5906d1cd0 100644
Binary files a/readthedocs/locale/en/LC_MESSAGES/django.mo and b/readthedocs/locale/en/LC_MESSAGES/django.mo differ
diff --git a/readthedocs/locale/en/LC_MESSAGES/django.po b/readthedocs/locale/en/LC_MESSAGES/django.po
index 9bf95bce2a0..5ed425fb491 100644
--- a/readthedocs/locale/en/LC_MESSAGES/django.po
+++ b/readthedocs/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-19 15:31-0700\n"
+"POT-Creation-Date: 2018-06-05 17:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,49 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: api/utils.py:97
-msgid "Sorry, no results on that page."
-msgstr ""
-
-#: api/utils.py:183
+#: api/utils.py:47
 #, python-format
 msgid "Invalid resource lookup data provided (mismatched type).: %(error)s"
 msgstr ""
 
-#: bookmarks/models.py:19 core/models.py:21 donate/models.py:33
-#: gold/models.py:36 projects/models.py:84
-msgid "User"
-msgstr ""
-
-#: bookmarks/models.py:21 builds/models.py:43 builds/models.py:309
-#: builds/models.py:329 comments/models.py:72 projects/models.py:837
-#: redirects/models.py:53
-msgid "Project"
-msgstr ""
-
-#: bookmarks/models.py:23 builds/models.py:331 comments/models.py:74
-#: projects/models.py:99 projects/models.py:839
-msgid "Version"
-msgstr ""
-
-#: bookmarks/models.py:25
-msgid "Page"
-msgstr ""
-
-#: bookmarks/models.py:27 builds/models.py:337 comments/models.py:163
-#: comments/models.py:228 donate/models.py:185 integrations/models.py:123
-msgid "Date"
-msgstr ""
-
-#: bookmarks/models.py:28
-msgid "URL"
-msgstr ""
-
-#: bookmarks/models.py:35
-#, python-format
-msgid "Bookmark %(url)s for %(user)s (%(pk)s)"
-msgstr ""
-
 #: builds/constants.py:13
 msgid "Triggered"
 msgstr ""
@@ -112,179 +74,177 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: builds/models.py:46 builds/models.py:333
+#: builds/models.py:50 builds/models.py:395 builds/models.py:416
+#: projects/models.py:896 redirects/models.py:53
+msgid "Project"
+msgstr ""
+
+#: builds/models.py:54 builds/models.py:420
 msgid "Type"
 msgstr ""
 
-#: builds/models.py:55
+#: builds/models.py:65
 msgid "Identifier"
 msgstr ""
 
-#: builds/models.py:61
+#: builds/models.py:71
 msgid "Verbose Name"
 msgstr ""
 
-#: builds/models.py:67 oauth/models.py:45 projects/models.py:87
-#: projects/models.py:842
+#: builds/models.py:78 oauth/models.py:46 projects/models.py:84
+#: projects/models.py:901
 msgid "Slug"
 msgstr ""
 
-#: builds/models.py:70
+#: builds/models.py:80
 msgid "Supported"
 msgstr ""
 
-#: builds/models.py:71 oauth/models.py:43 oauth/models.py:90
+#: builds/models.py:81 oauth/models.py:44 oauth/models.py:92
 #: redirects/models.py:26 templates/projects/project_versions.html:46
 msgid "Active"
 msgstr ""
 
-#: builds/models.py:72 templates/projects/includes/icon_built.html:4
+#: builds/models.py:82 templates/projects/includes/icon_built.html:4
 msgid "Built"
 msgstr ""
 
-#: builds/models.py:73 templates/projects/includes/icon_built.html:7
+#: builds/models.py:83 templates/projects/includes/icon_built.html:7
 msgid "Uploaded"
 msgstr ""
 
-#: builds/models.py:75 projects/models.py:213
+#: builds/models.py:85 projects/models.py:217
 msgid "Privacy Level"
 msgstr ""
 
-#: builds/models.py:76
+#: builds/models.py:89
 msgid "Level of privacy for this Version."
 msgstr ""
 
-#: builds/models.py:79
+#: builds/models.py:92
 msgid "Machine Created"
 msgstr ""
 
 #. Translators: Permission around whether a user can view the
 #. version
-#: builds/models.py:89
+#: builds/models.py:102
 msgid "View Version"
 msgstr ""
 
-#: builds/models.py:93
-#, python-format
-msgid "Version %(version)s of %(project)s (%(pk)s)"
+#: builds/models.py:106
+#, python-brace-format
+msgid "Version {version} of {project} ({pk})"
 msgstr ""
 
-#: builds/models.py:311
+#: builds/models.py:396
 msgid "From slug"
 msgstr ""
 
-#: builds/models.py:312
+#: builds/models.py:398
 msgid "To slug"
 msgstr ""
 
-#: builds/models.py:314
+#: builds/models.py:399
 msgid "Largest"
 msgstr ""
 
-#: builds/models.py:317
-#, python-format
-msgid "Alias for %(project)s: %(from)s -> %(to)s"
+#: builds/models.py:403
+#, python-brace-format
+msgid "Alias for {project}: {_from} -> {to}"
 msgstr ""
 
-#: builds/models.py:335
+#: builds/models.py:418 projects/models.py:97 projects/models.py:898
+#: templates/base.html:208
+msgid "Version"
+msgstr ""
+
+#: builds/models.py:422
 msgid "State"
 msgstr ""
 
-#: builds/models.py:338
+#: builds/models.py:423 integrations/models.py:128
+msgid "Date"
+msgstr ""
+
+#: builds/models.py:424
 msgid "Success"
 msgstr ""
 
-#: builds/models.py:340
+#: builds/models.py:426
 msgid "Setup"
 msgstr ""
 
-#: builds/models.py:341
+#: builds/models.py:427
 msgid "Setup error"
 msgstr ""
 
-#: builds/models.py:342
+#: builds/models.py:428
 msgid "Output"
 msgstr ""
 
-#: builds/models.py:343 templates/builds/build_detail.html:130
+#: builds/models.py:429 templates/builds/build_detail.html:175
 msgid "Error"
 msgstr ""
 
-#: builds/models.py:344
+#: builds/models.py:430
 msgid "Exit code"
 msgstr ""
 
-#: builds/models.py:345 projects/models.py:845
+#: builds/models.py:432 projects/models.py:904
 msgid "Commit"
 msgstr ""
 
-#: builds/models.py:347
+#: builds/models.py:434
 msgid "Build Length"
 msgstr ""
 
-#: builds/models.py:349
+#: builds/models.py:437
 msgid "Builder"
 msgstr ""
 
-#: builds/models.py:363
-#, python-format
-msgid "Build %(project)s for %(usernames)s (%(pk)s)"
+#: builds/models.py:440
+msgid "Cold Storage"
 msgstr ""
 
-#: builds/models.py:407 templates/core/project_details.html:68
+#: builds/models.py:453
+#, python-brace-format
+msgid "Build {project} for {usernames} ({pk})"
+msgstr ""
+
+#: builds/models.py:501
 msgid "Build"
 msgstr ""
 
-#: builds/models.py:410
+#: builds/models.py:503
 msgid "Command"
 msgstr ""
 
-#: builds/models.py:411 oauth/models.py:97 projects/models.py:88
-#: templates/core/project_details.html:77
+#: builds/models.py:504 oauth/models.py:104 projects/models.py:85
+#: templates/core/project_details.html:78
 msgid "Description"
 msgstr ""
 
-#: builds/models.py:412
+#: builds/models.py:505
 msgid "Command output"
 msgstr ""
 
-#: builds/models.py:413
+#: builds/models.py:506
 msgid "Command exit code"
 msgstr ""
 
-#: builds/models.py:415
+#: builds/models.py:508
 msgid "Start time"
 msgstr ""
 
-#: builds/models.py:416
+#: builds/models.py:509
 msgid "End time"
 msgstr ""
 
-#: builds/models.py:425
+#: builds/models.py:519
 #, python-brace-format
 msgid "Build command {pk} for build {build}"
 msgstr ""
 
-#: comments/models.py:76 projects/models.py:175 projects/models.py:843
-msgid "Path"
-msgstr ""
-
-#: comments/models.py:78
-msgid "Raw Source"
-msgstr ""
-
-#: comments/models.py:123
-msgid "Hash"
-msgstr ""
-
-#: comments/models.py:164
-msgid "Rating"
-msgstr ""
-
-#: comments/models.py:165 donate/models.py:59
-msgid "Text"
-msgstr ""
-
 #: core/admin.py:28
 msgid "user projects"
 msgstr ""
@@ -301,312 +261,129 @@ msgstr ""
 msgid "has project with recent builds"
 msgstr ""
 
-#: core/forms.py:19
+#: core/forms.py:21
 msgid "First name"
 msgstr ""
 
-#: core/forms.py:20
+#: core/forms.py:22
 msgid "Last name"
 msgstr ""
 
-#: core/middleware.py:119 core/middleware.py:126
+#: core/forms.py:51
+msgid "Username"
+msgstr ""
+
+#: core/forms.py:52
+msgid "Please type your username to confirm."
+msgstr ""
+
+#: core/forms.py:63
+msgid "Username does not match!"
+msgstr ""
+
+#: core/middleware.py:121 core/middleware.py:128
 msgid "Invalid hostname"
 msgstr ""
 
-#: core/models.py:23
+#: core/models.py:25 gold/models.py:36 projects/models.py:81
+msgid "User"
+msgstr ""
+
+#: core/models.py:26
 msgid "Whitelisted"
 msgstr ""
 
-#: core/models.py:24
+#: core/models.py:27
 msgid "Banned"
 msgstr ""
 
-#: core/models.py:25
+#: core/models.py:28
 msgid "Homepage"
 msgstr ""
 
-#: core/models.py:26
+#: core/models.py:30
 msgid "See paid advertising"
 msgstr ""
 
-#: core/models.py:27
+#: core/models.py:31
 msgid "If unchecked, you will still see community ads."
 msgstr ""
 
-#: core/models.py:30
+#: core/models.py:35
 msgid "Allow email"
 msgstr ""
 
-#: core/models.py:31
+#: core/models.py:36
 msgid "Show your email on VCS contributions."
 msgstr ""
 
-#: core/models.py:36
+#: core/models.py:42
 #, python-format
 msgid "%(username)s's profile"
 msgstr ""
 
-#: core/validators.py:23
+#: core/validators.py:25
 msgid "Enter a valid plain or internationalized domain name value"
 msgstr ""
 
-#: core/validators.py:31
+#: core/validators.py:33
 msgid "Enter a valid domain name value"
 msgstr ""
 
-#: doc_builder/environments.py:231
-msgid "Command killed due to excessive memory consumption\n"
+#: core/validators.py:72
+msgid "Invalid character in the URL"
 msgstr ""
 
-#: doc_builder/environments.py:236
-msgid "Command exited abnormally"
+#: core/validators.py:93
+msgid "Invalid scheme for URL"
 msgstr ""
 
-#: doc_builder/environments.py:425
-msgid "An unexpected error occurred"
+#: doc_builder/environments.py:249
+msgid "Command killed due to excessive memory consumption\n"
 msgstr ""
 
-#: doc_builder/environments.py:497
+#: doc_builder/environments.py:254
+msgid "Command exited abnormally"
+msgstr ""
+
+#: doc_builder/environments.py:645
 msgid "A build environment is currently running for this version"
 msgstr ""
 
-#: doc_builder/environments.py:603 projects/tasks.py:215
+#: doc_builder/environments.py:827 projects/tasks.py:455
 msgid "Build exited due to time out"
 msgstr ""
 
-#: doc_builder/environments.py:606
+#: doc_builder/environments.py:830
 msgid "Build exited due to excessive memory consumption"
 msgstr ""
 
-#: doc_builder/environments.py:609
+#: doc_builder/environments.py:833
 #, python-brace-format
 msgid "Build exited due to unknown error: {0}"
 msgstr ""
 
-#: donate/forms.py:39
-msgid "Make this donation public"
-msgstr ""
-
-#: donate/forms.py:42
-msgid "Your name and image will be displayed on the donation page"
-msgstr ""
-
-#: donate/forms.py:43
-msgid "Your email is used for Gravatar and so we can send you a receipt"
-msgstr ""
-
-#: donate/forms.py:44
-msgid "URL of your company's logo, images should be 300x300 pixels or less"
-msgstr ""
-
-#: donate/forms.py:45
-msgid "Companies donating over $400 can specify a logo URL and site link"
+#: doc_builder/exceptions.py:22
+#, python-brace-format
+msgid ""
+"There was a problem with Read the Docs while building your documentation. "
+"Please report this to us with your build id ({build_id})."
 msgstr ""
 
-#: donate/forms.py:110
-msgid "Your email is used so we can send you a receipt"
+#: doc_builder/exceptions.py:30
+msgid "Build environment creation failed"
 msgstr ""
 
-#: donate/models.py:27 donate/models.py:54 gold/models.py:33 oauth/models.py:35
-#: oauth/models.py:78 projects/models.py:80
+#: gold/models.py:33 oauth/models.py:36 oauth/models.py:80
+#: projects/models.py:77
 msgid "Publication date"
 msgstr ""
 
-#: donate/models.py:28 donate/models.py:55 gold/models.py:34 oauth/models.py:36
-#: oauth/models.py:79 projects/models.py:81
+#: gold/models.py:34 oauth/models.py:37 oauth/models.py:81
+#: projects/models.py:78
 msgid "Modified date"
 msgstr ""
 
-#: donate/models.py:29 projects/constants.py:90
-msgid "Public"
-msgstr ""
-
-#: donate/models.py:31
-msgid "name"
-msgstr ""
-
-#: donate/models.py:32 oauth/models.py:47
-msgid "Email"
-msgstr ""
-
-#: donate/models.py:35
-msgid "Amount"
-msgstr ""
-
-#: donate/models.py:36
-msgid "Logo URL"
-msgstr ""
-
-#: donate/models.py:38
-msgid "Site URL"
-msgstr ""
-
-#: donate/models.py:57 oauth/models.py:46 oauth/models.py:95
-#: projects/models.py:86 projects/models.py:841
-msgid "Name"
-msgstr ""
-
-#: donate/models.py:58
-msgid "Analytics ID"
-msgstr ""
-
-#: donate/models.py:60
-msgid "Link URL"
-msgstr ""
-
-#: donate/models.py:61
-msgid "Image URL"
-msgstr ""
-
-#: donate/models.py:62
-msgid "Display Type"
-msgstr ""
-
-#: donate/models.py:64
-msgid "Sold Impressions"
-msgstr ""
-
-#: donate/models.py:65
-msgid "Sold Days"
-msgstr ""
-
-#: donate/models.py:66
-msgid "Sold Clicks"
-msgstr ""
-
-#: donate/models.py:67 projects/models.py:237
-msgid "Programming Language"
-msgstr ""
-
-#: donate/models.py:70 projects/models.py:105
-msgid "Theme"
-msgstr ""
-
-#: donate/models.py:73
-msgid "Community Ad"
-msgstr ""
-
-#: donate/models.py:74 projects/constants.py:69
-msgid "Live"
-msgstr ""
-
-#: donate/models.py:186
-msgid "Offer"
-msgstr ""
-
-#: donate/models.py:188
-msgctxt "View"
-msgid "Number of display on a screen that were sold"
-msgstr ""
-
-#: donate/models.py:189
-msgid "Clicks"
-msgstr ""
-
-#: donate/models.py:262
-msgid "Filter Type"
-msgstr ""
-
-#: donate/templates/donate/create.html:6 donate/templates/donate/list.html:6
-#: donate/templates/donate/success.html:6
-msgid "Sustainability"
-msgstr ""
-
-#: donate/templates/donate/create.html:75
-#: donate/templates/donate/ethicalads.html:70
-msgid "Custom amount"
-msgstr ""
-
-#: donate/templates/donate/create.html:79
-msgid "1 Hour"
-msgstr ""
-
-#: donate/templates/donate/create.html:80
-msgid "2 Hours"
-msgstr ""
-
-#: donate/templates/donate/create.html:81
-msgid "4 Hours"
-msgstr ""
-
-#: donate/templates/donate/create.html:82
-msgid "1 Day"
-msgstr ""
-
-#: donate/templates/donate/create.html:83
-msgid "2 Days"
-msgstr ""
-
-#: donate/templates/donate/create.html:84
-msgid "3 Days"
-msgstr ""
-
-#: donate/templates/donate/create.html:85
-msgid "4 Days"
-msgstr ""
-
-#: donate/templates/donate/create.html:86
-msgid "5 Days"
-msgstr ""
-
-#: donate/templates/donate/create.html:87
-msgid "2 Weeks"
-msgstr ""
-
-#: donate/templates/donate/create.html:88
-msgid "3 Weeks"
-msgstr ""
-
-#: donate/templates/donate/create.html:89
-msgid "4 Weeks"
-msgstr ""
-
-#: donate/templates/donate/create.html:100
-msgid "Donate"
-msgstr ""
-
-#: donate/templates/donate/ethicalads-success.html:6
-msgid "Sponsorship"
-msgstr ""
-
-#: donate/templates/donate/ethicalads.html:6
-msgid "Pay for your ad"
-msgstr ""
-
-#: donate/templates/donate/ethicalads.html:85
-msgid "Pay"
-msgstr ""
-
-#: donate/templates/donate/list.html:77
-#: donate/templates/donate/progress.html:63
-msgid "Donate Now"
-msgstr ""
-
-#: donate/templates/donate/progress.html:25
-msgid "Read More"
-msgstr ""
-
-#: donate/templates/donate/promo_404.html:6 templates/401.html:6
-#: templates/404.html:6
-msgid "Maze Found"
-msgstr ""
-
-#: donate/templates/donate/promo_500.html:5 templates/500.html:5
-msgid "Server Error"
-msgstr ""
-
-#: donate/templates/donate/promo_detail.html:6
-msgid "Promo Detail"
-msgstr ""
-
-#: donate/views.py:36
-msgid "Your payment has been received"
-msgstr ""
-
-#: donate/views.py:52
-msgid "Your contribution has been received"
-msgstr ""
-
 #: gold/models.py:37 gold/templates/gold/subscription_detail.html:40
 msgid "Level"
 msgstr ""
@@ -645,8 +422,9 @@ msgstr[1] ""
 #: gold/templates/gold/projects.html:42 templates/account/email.html:39
 #: templates/projects/domain_list.html:27
 #: templates/projects/project_notifications.html:56
-#: templates/projects/project_redirects.html:93
-#: templates/projects/project_translations.html:26
+#: templates/projects/project_redirects.html:98
+#: templates/projects/project_translations.html:43
+#: templates/projects/project_users.html:39
 msgid "Remove"
 msgstr ""
 
@@ -659,15 +437,6 @@ msgid "Choose which project you would like to add."
 msgstr ""
 
 #: gold/templates/gold/projects.html:55 templates/projects/domain_form.html:32
-#: templates/projects/domain_list.html:38
-#: templates/projects/project_advanced.html:33
-#: templates/projects/project_edit.html:36
-#: templates/projects/project_notifications.html:69
-#: templates/projects/project_notifications.html:80
-#: templates/projects/project_redirects.html:109
-#: templates/projects/project_translations.html:36
-#: templates/projects/project_users.html:51
-#: templates/projects/project_versions.html:53
 msgid "Submit"
 msgstr ""
 
@@ -700,7 +469,7 @@ msgid "Card"
 msgstr ""
 
 #: gold/templates/gold/subscription_detail.html:50
-#: gold/templates/gold/subscription_form.html:135
+#: gold/templates/gold/subscription_form.html:138
 msgid "Update Subscription"
 msgstr ""
 
@@ -756,13 +525,19 @@ msgstr ""
 
 #: gold/templates/gold/subscription_form.html:63
 msgid ""
+"Becoming a Gold Member also makes Read the Docs ad-free for as long as you "
+"are logged-in."
+msgstr ""
+
+#: gold/templates/gold/subscription_form.html:66
+msgid ""
 "\n"
 "      You can also make one-time donations on our <a href=\"https://"
 "readthedocs.org/sustainability/\">sustainability</a> page.\n"
 "    "
 msgstr ""
 
-#: gold/templates/gold/subscription_form.html:71
+#: gold/templates/gold/subscription_form.html:74
 msgid ""
 "\n"
 "    We ask that folks who use custom Domains give Read the Docs $5 per "
@@ -772,462 +547,517 @@ msgid ""
 "    "
 msgstr ""
 
-#: gold/templates/gold/subscription_form.html:89
+#: gold/templates/gold/subscription_form.html:92
 msgid "Become a Gold Member"
 msgstr ""
 
-#: gold/templates/gold/subscription_form.html:91
+#: gold/templates/gold/subscription_form.html:94
 msgid "Update Your Subscription"
 msgstr ""
 
-#: gold/templates/gold/subscription_form.html:106
+#: gold/templates/gold/subscription_form.html:109
 msgid "Current card"
 msgstr ""
 
-#: gold/templates/gold/subscription_form.html:117
+#: gold/templates/gold/subscription_form.html:120
 msgid "Edit Card"
 msgstr ""
 
-#: gold/templates/gold/subscription_form.html:133
+#: gold/templates/gold/subscription_form.html:136
+#: templates/account/signup.html:10 templates/account/signup.html:22
 msgid "Sign Up"
 msgstr ""
 
-#: gold/templates/gold/subscription_form.html:139
+#: gold/templates/gold/subscription_form.html:142
 msgid "All information is submitted directly to Stripe."
 msgstr ""
 
-#: gold/views.py:72
+#: gold/views.py:76
 msgid "Your subscription has been updated"
 msgstr ""
 
-#: gold/views.py:84
+#: gold/views.py:89
 msgid "Your subscription has been cancelled"
 msgstr ""
 
-#: integrations/models.py:125 integrations/models.py:128
+#: integrations/models.py:130 integrations/models.py:133
 msgid "Request headers"
 msgstr ""
 
-#: integrations/models.py:126
+#: integrations/models.py:131
 msgid "Request body"
 msgstr ""
 
-#: integrations/models.py:129
+#: integrations/models.py:134
 msgid "Response body"
 msgstr ""
 
-#: integrations/models.py:132
+#: integrations/models.py:137
 msgid "Status code"
 msgstr ""
 
-#: integrations/models.py:141
+#: integrations/models.py:147
 #, python-brace-format
 msgid "Exchange {0}"
 msgstr ""
 
-#: integrations/models.py:236
+#: integrations/models.py:246
 msgid "GitHub incoming webhook"
 msgstr ""
 
-#: integrations/models.py:237
+#: integrations/models.py:247
 msgid "Bitbucket incoming webhook"
 msgstr ""
 
-#: integrations/models.py:238
+#: integrations/models.py:248
 msgid "GitLab incoming webhook"
 msgstr ""
 
-#: integrations/models.py:239
+#: integrations/models.py:249
 msgid "Generic API incoming webhook"
 msgstr ""
 
-#: integrations/models.py:246
+#: integrations/models.py:256
 msgid "Integration type"
 msgstr ""
 
-#: integrations/models.py:250
+#: integrations/models.py:260
 msgid "Provider data"
 msgstr ""
 
-#: integrations/models.py:262
+#: integrations/models.py:273
 #, python-brace-format
 msgid "{0} for {1}"
 msgstr ""
 
-#: notifications/forms.py:27
+#: notifications/forms.py:28
 msgid "Notification"
 msgstr ""
 
-#: oauth/models.py:38 oauth/models.py:82
+#: oauth/models.py:40 oauth/models.py:85
 msgid "Users"
 msgstr ""
 
-#: oauth/models.py:41 oauth/models.py:85
+#: oauth/models.py:42 oauth/models.py:87
 msgid "Connected account"
 msgstr ""
 
-#: oauth/models.py:48
-msgid "Avatar image URL"
+#: oauth/models.py:47 oauth/models.py:101 projects/models.py:83
+#: projects/models.py:900
+msgid "Name"
+msgstr ""
+
+#: oauth/models.py:48 templates/base.html:131
+msgid "Email"
 msgstr ""
 
 #: oauth/models.py:49
+msgid "Avatar image URL"
+msgstr ""
+
+#: oauth/models.py:51
 msgid "URL to organization page"
 msgstr ""
 
-#: oauth/models.py:52 oauth/models.py:117
+#: oauth/models.py:53 oauth/models.py:140
 msgid "Serialized API response"
 msgstr ""
 
-#: oauth/models.py:88
+#: oauth/models.py:90
 msgid "Organization"
 msgstr ""
 
-#: oauth/models.py:96
+#: oauth/models.py:102
 msgid "Full Name"
 msgstr ""
 
-#: oauth/models.py:98
+#: oauth/models.py:107
 msgid "Description of the project"
 msgstr ""
 
-#: oauth/models.py:99
+#: oauth/models.py:110
 msgid "Owner avatar image URL"
 msgstr ""
 
-#: oauth/models.py:102
+#: oauth/models.py:116
 msgid "SSH URL"
 msgstr ""
 
-#: oauth/models.py:105
+#: oauth/models.py:122
 msgid "Repository clone URL"
 msgstr ""
 
-#: oauth/models.py:110
+#: oauth/models.py:129
 msgid "HTML URL"
 msgstr ""
 
-#: oauth/models.py:112
+#: oauth/models.py:131
 msgid "Private repository"
 msgstr ""
 
-#: oauth/models.py:113
+#: oauth/models.py:132
 msgid "Has admin privilege"
 msgstr ""
 
-#: oauth/models.py:114
+#: oauth/models.py:134
 msgid "vcs"
 msgstr ""
 
-#: oauth/utils.py:34
+#: oauth/utils.py:43
 msgid ""
 "Webhook activation failed. There are no connected services for this project."
 msgstr ""
 
-#: oauth/utils.py:43 oauth/utils.py:73
+#: oauth/utils.py:51 oauth/utils.py:94
 msgid "Webhook activated"
 msgstr ""
 
-#: oauth/utils.py:51
+#: oauth/utils.py:60
 msgid "Webhook activation failed. Make sure you have permissions to set it."
 msgstr ""
 
-#: oauth/utils.py:56
+#: oauth/utils.py:67
 #, python-brace-format
 msgid ""
 "No accounts available to set webhook on. Please connect your {network} "
 "account."
 msgstr ""
 
-#: oauth/utils.py:79
+#: oauth/utils.py:101
 msgid ""
 "Webhook activation failed. Make sure you have the necessary permissions."
 msgstr ""
 
-#: payments/forms.py:84
+#: payments/forms.py:85
 msgid "Card number"
 msgstr ""
 
-#: payments/forms.py:93
+#: payments/forms.py:94
 msgid "Card expiration"
 msgstr ""
 
-#: payments/forms.py:102
+#: payments/forms.py:103
 msgid "Card CVV"
 msgstr ""
 
-#: payments/forms.py:170
+#: payments/forms.py:171
 msgid "There was a problem communicating with Stripe"
 msgstr ""
 
-#: projects/constants.py:21
+#: profiles/views.py:301
+msgid "Updated your advertising preferences"
+msgstr ""
+
+#: projects/admin.py:91
+msgid "Yes"
+msgstr ""
+
+#: projects/constants.py:25
 msgid "Automatically Choose"
 msgstr ""
 
-#: projects/constants.py:22
+#: projects/constants.py:26
 msgid "Sphinx Html"
 msgstr ""
 
-#: projects/constants.py:23
+#: projects/constants.py:27
 msgid "Mkdocs (Markdown)"
 msgstr ""
 
-#: projects/constants.py:24
+#: projects/constants.py:28
 msgid "Sphinx HtmlDir"
 msgstr ""
 
-#: projects/constants.py:25
+#: projects/constants.py:29
 msgid "Sphinx Single Page HTML"
 msgstr ""
 
 #. Translators: This is a name of a Sphinx theme.
-#: projects/constants.py:30
+#: projects/constants.py:34
 msgid "Default"
 msgstr ""
 
 #. Translators: This is a name of a Sphinx theme.
-#: projects/constants.py:32
+#: projects/constants.py:36
 msgid "Sphinx Docs"
 msgstr ""
 
 #. Translators: This is a name of a Sphinx theme.
-#: projects/constants.py:36
+#: projects/constants.py:40
 msgid "Traditional"
 msgstr ""
 
 #. Translators: This is a name of a Sphinx theme.
-#: projects/constants.py:38
+#: projects/constants.py:42
 msgid "Nature"
 msgstr ""
 
 #. Translators: This is a name of a Sphinx theme.
-#: projects/constants.py:40
+#: projects/constants.py:44
 msgid "Haiku"
 msgstr ""
 
-#: projects/constants.py:70
+#: projects/constants.py:73
+msgid "Live"
+msgstr ""
+
+#: projects/constants.py:74
 msgid "Deleted"
 msgstr ""
 
-#: projects/constants.py:79
+#: projects/constants.py:83
 msgid "Git"
 msgstr ""
 
-#: projects/constants.py:80
+#: projects/constants.py:84
 msgid "Subversion"
 msgstr ""
 
-#: projects/constants.py:81
+#: projects/constants.py:85
 msgid "Mercurial"
 msgstr ""
 
-#: projects/constants.py:82
+#: projects/constants.py:86
 msgid "Bazaar"
 msgstr ""
 
-#: projects/constants.py:91
+#: projects/constants.py:94
+msgid "Public"
+msgstr ""
+
+#: projects/constants.py:95
 msgid "Protected"
 msgstr ""
 
-#: projects/constants.py:92
+#: projects/constants.py:96
 msgid "Private"
 msgstr ""
 
-#: projects/constants.py:103
+#: projects/constants.py:107
 msgid "CPython 2.x"
 msgstr ""
 
-#: projects/constants.py:104
+#: projects/constants.py:108
 msgid "CPython 3.x"
 msgstr ""
 
-#: projects/forms.py:92
-msgid "Edit advanced project options"
+#: projects/exceptions.py:17
+msgid ""
+"A configuration file was not found. Make sure you have a conf.py file in "
+"your repository."
 msgstr ""
 
-#: projects/forms.py:115
-msgid "Invalid project name, a project already exists with that name"
+#: projects/exceptions.py:22
+msgid ""
+"We found more than one conf.py and are not sure which one to use. Please, "
+"specify the correct file under the Advanced settings tab in the project's "
+"Admin."
 msgstr ""
 
-#: projects/forms.py:122
-msgid "Invalid character in repo name"
+#: projects/exceptions.py:33
+msgid ""
+"There was a problem connecting to your repository, ensure that your "
+"repository URL is correct."
 msgstr ""
 
-#: projects/forms.py:125
+#: projects/exceptions.py:37
 msgid ""
-"It looks like you entered a private repo - please use the public (http:// or "
-"git://) clone url"
+"There was a problem connecting to your repository, ensure that your "
+"repository URL is correct and your repository is public. Private "
+"repositories are not supported."
 msgstr ""
 
-#: projects/forms.py:139
+#: projects/exceptions.py:43
+msgid "One or more submodule URLs are not valid."
+msgstr ""
+
+#: projects/forms.py:97
+msgid "Edit advanced project options"
+msgstr ""
+
+#: projects/forms.py:120
+msgid "Invalid project name, a project already exists with that name"
+msgstr ""
+
+#: projects/forms.py:133
 msgid "Repository invalid"
 msgstr ""
 
-#: projects/forms.py:181 projects/models.py:201
+#: projects/forms.py:176 projects/models.py:205
 msgid "(Beta) The Python interpreter used to create the virtual environment."
 msgstr ""
 
-#: projects/forms.py:212
+#: projects/forms.py:209
 msgid ""
 "Your configuration file is invalid, make sure it contains conf.py in it."
 msgstr ""
 
-#: projects/forms.py:261
+#: projects/forms.py:237
+#, python-brace-format
+msgid "There is already a \"{lang}\" translation for the {proj} project."
+msgstr ""
+
+#: projects/forms.py:289
 msgid "Subproject nesting is not supported"
 msgstr ""
 
-#: projects/forms.py:339 templates/core/project_detail_right.html:118
+#: projects/forms.py:296
+msgid "A project can not be a subproject of itself"
+msgstr ""
+
+#: projects/forms.py:384 templates/core/project_detail_right.html:133
 msgid "Default Version"
 msgstr ""
 
-#: projects/forms.py:366
+#: projects/forms.py:414
 msgid "Zip file of HTML"
 msgstr ""
 
-#: projects/forms.py:368
+#: projects/forms.py:416
 msgid "Overwrite existing HTML?"
 msgstr ""
 
-#: projects/forms.py:381
+#: projects/forms.py:429
 msgid "That version is already active!"
 msgstr ""
 
-#: projects/forms.py:383
+#: projects/forms.py:431
 msgid "Must upload a zip file."
 msgstr ""
 
-#: projects/forms.py:398
+#: projects/forms.py:446
 msgid "Version of the project you are uploading HTML for"
 msgstr ""
 
-#: projects/forms.py:418
-#, python-format
-msgid "User %(name)s does not exist"
-msgstr ""
-
-#: projects/forms.py:484
-#, python-format
-msgid "Project %(name)s does not exist"
+#: projects/forms.py:467
+#, python-brace-format
+msgid "User {name} does not exist"
 msgstr ""
 
-#: projects/forms.py:556
+#: projects/forms.py:661
 msgid "Only 1 Domain can be canonical at a time."
 msgstr ""
 
-#: projects/models.py:53
+#: projects/models.py:50
 msgid "Parent"
 msgstr ""
 
-#: projects/models.py:55
+#: projects/models.py:52
 msgid "Child"
 msgstr ""
 
-#: projects/models.py:57
+#: projects/models.py:54
 msgid "Alias"
 msgstr ""
 
-#: projects/models.py:89
+#: projects/models.py:86
 msgid "The reStructuredText description of the project"
 msgstr ""
 
-#: projects/models.py:91
+#: projects/models.py:88
 msgid "Repository URL"
 msgstr ""
 
-#: projects/models.py:92
+#: projects/models.py:90
 msgid "Hosted documentation repository URL"
 msgstr ""
 
-#: projects/models.py:93
+#: projects/models.py:91
 msgid "Repository type"
 msgstr ""
 
-#: projects/models.py:95
+#: projects/models.py:93
 msgid "Project homepage"
 msgstr ""
 
-#: projects/models.py:96
+#: projects/models.py:94
 msgid "The project's homepage"
 msgstr ""
 
-#: projects/models.py:97
+#: projects/models.py:95
 msgid "Canonical URL"
 msgstr ""
 
-#: projects/models.py:98
+#: projects/models.py:96
 msgid "URL that documentation is expected to serve from"
 msgstr ""
 
-#: projects/models.py:100
+#: projects/models.py:98
 msgid "Project version these docs apply to, i.e. 1.0a"
 msgstr ""
 
-#: projects/models.py:102
+#: projects/models.py:100
 msgid "Copyright"
 msgstr ""
 
-#: projects/models.py:103
+#: projects/models.py:101
 msgid "Project copyright information"
 msgstr ""
 
-#: projects/models.py:108
+#: projects/models.py:103
+msgid "Theme"
+msgstr ""
+
+#: projects/models.py:106
 msgid "Examples"
 msgstr ""
 
-#: projects/models.py:109
+#: projects/models.py:107
 msgid "Suffix"
 msgstr ""
 
-#: projects/models.py:112
+#: projects/models.py:110
 msgid "Single version"
 msgstr ""
 
-#: projects/models.py:113
+#: projects/models.py:111
 msgid ""
 "A single version site has no translations and only your \"latest\" version, "
 "served at the root of the domain. Use this with caution, only turn it on if "
 "you will <b>never</b> have multiple versions of your docs."
 msgstr ""
 
-#: projects/models.py:118
+#: projects/models.py:116
 msgid "Default version"
 msgstr ""
 
-#: projects/models.py:119
+#: projects/models.py:117
 msgid "The version of your project that / redirects to"
 msgstr ""
 
-#: projects/models.py:123
+#: projects/models.py:121
 msgid "Default branch"
 msgstr ""
 
-#: projects/models.py:124
+#: projects/models.py:122
 msgid ""
 "What branch \"latest\" points to. Leave empty to use the default value for "
 "your VCS (eg. <code>trunk</code> or <code>master</code>)."
 msgstr ""
 
-#: projects/models.py:128
+#: projects/models.py:126
 msgid "Requirements file"
 msgstr ""
 
-#: projects/models.py:130
+#: projects/models.py:128
 msgid ""
 "A <a href=\"https://pip.pypa.io/en/latest/user_guide.html#requirements-files"
 "\">pip requirements file</a> needed to build your documentation. Path from "
 "the root of your project."
 msgstr ""
 
-#: projects/models.py:135
+#: projects/models.py:133
 msgid "Documentation type"
 msgstr ""
 
-#: projects/models.py:137
+#: projects/models.py:135
 msgid ""
-"Type of documentation you are building. <a href=\"http://sphinx-doc.org/"
-"builders.html#sphinx.builders.html.DirectoryHTMLBuilder\">More info</a>."
+"Type of documentation you are building. <a href=\"http://www.sphinx-doc.org/"
+"en/stable/builders.html#sphinx.builders.html.DirectoryHTMLBuilder\">More "
+"info</a>."
 msgstr ""
 
-#: projects/models.py:142
+#: projects/models.py:141
 msgid "Allow Comments"
 msgstr ""
 
@@ -1279,230 +1109,290 @@ msgstr ""
 msgid "If unchecked, users will still see community ads."
 msgstr ""
 
-#: projects/models.py:166
+#: projects/models.py:164
+msgid "Show version warning"
+msgstr ""
+
+#: projects/models.py:165
+msgid "Show warning banner in non-stable nor latest versions."
+msgstr ""
+
+#: projects/models.py:170
 msgid "Enable EPUB build"
 msgstr ""
 
-#: projects/models.py:168
+#: projects/models.py:172
 msgid "Create a EPUB version of your documentation with each build."
 msgstr ""
 
-#: projects/models.py:170
+#: projects/models.py:174
 msgid "Enable PDF build"
 msgstr ""
 
-#: projects/models.py:172
+#: projects/models.py:176
 msgid "Create a PDF version of your documentation with each build."
 msgstr ""
 
-#: projects/models.py:176
+#: projects/models.py:179 projects/models.py:902
+msgid "Path"
+msgstr ""
+
+#: projects/models.py:180
 msgid "The directory where <code>conf.py</code> lives"
 msgstr ""
 
-#: projects/models.py:179
+#: projects/models.py:183
 msgid "Python configuration file"
 msgstr ""
 
-#: projects/models.py:180
+#: projects/models.py:184
 msgid ""
 "Path from project root to <code>conf.py</code> file (ex. <code>docs/conf.py</"
 "code>). Leave blank if you want us to find it for you."
 msgstr ""
 
-#: projects/models.py:184
+#: projects/models.py:188
 msgid "Featured"
 msgstr ""
 
-#: projects/models.py:185
+#: projects/models.py:189
 msgid "Skip"
 msgstr ""
 
-#: projects/models.py:186
+#: projects/models.py:190
 msgid "Mirror"
 msgstr ""
 
-#: projects/models.py:188
+#: projects/models.py:192
 msgid "Install Project"
 msgstr ""
 
-#: projects/models.py:189
+#: projects/models.py:193
 msgid ""
 "Install your project inside a virtualenv using <code>setup.py install</code>"
 msgstr ""
 
-#: projects/models.py:197
+#: projects/models.py:201
 msgid "Python Interpreter"
 msgstr ""
 
-#: projects/models.py:205
+#: projects/models.py:209
 msgid "Use system packages"
 msgstr ""
 
-#: projects/models.py:206
+#: projects/models.py:210
 msgid "Give the virtual environment access to the global site-packages dir."
 msgstr ""
 
-#: projects/models.py:210
+#: projects/models.py:214
 msgid "Django Packages URL"
 msgstr ""
 
-#: projects/models.py:215
+#: projects/models.py:219
 msgid ""
 "(Beta) Level of privacy that you want on the repository. Protected means "
 "public but not in listings."
 msgstr ""
 
-#: projects/models.py:218
+#: projects/models.py:222
 msgid "Version Privacy Level"
 msgstr ""
 
-#: projects/models.py:221
+#: projects/models.py:225
 msgid ""
 "(Beta) Default level of privacy you want on built versions of documentation."
 msgstr ""
 
-#: projects/models.py:226
+#: projects/models.py:230
 msgid "Related projects"
 msgstr ""
 
-#: projects/models.py:230
+#: projects/models.py:234
 msgid "Language"
 msgstr ""
 
-#: projects/models.py:231
+#: projects/models.py:235
 msgid ""
 "The language the project documentation is rendered in. Note: this affects "
 "your project's URL."
 msgstr ""
 
-#: projects/models.py:240
+#: projects/models.py:241
+msgid "Programming Language"
+msgstr ""
+
+#: projects/models.py:245
 msgid "The primary programming language the project is written in."
 msgstr ""
 
-#: projects/models.py:250
+#: projects/models.py:255
 msgid "Number of Major versions"
 msgstr ""
 
-#: projects/models.py:254
+#: projects/models.py:259
 msgid "2 means supporting 3.X.X and 2.X.X, but not 1.X.X"
 msgstr ""
 
-#: projects/models.py:257
+#: projects/models.py:262
 msgid "Number of Minor versions"
 msgstr ""
 
-#: projects/models.py:261
+#: projects/models.py:266
 msgid "2 means supporting 2.2.X and 2.1.X, but not 2.0.X"
 msgstr ""
 
-#: projects/models.py:264
+#: projects/models.py:269
 msgid "Number of Point versions"
 msgstr ""
 
-#: projects/models.py:268
+#: projects/models.py:273
 msgid "2 means supporting 2.2.2 and 2.2.1, but not 2.2.0"
 msgstr ""
 
-#: projects/models.py:272
+#: projects/models.py:277
 msgid "This project has been built with a webhook"
 msgstr ""
 
-#: projects/models.py:275
+#: projects/models.py:280
 msgid "This project has been successfully cloned"
 msgstr ""
 
 #. Translators: Permission around whether a user can view the
 #. project
-#: projects/models.py:287
+#: projects/models.py:292
 msgid "View Project"
 msgstr ""
 
-#: projects/models.py:309
+#: projects/models.py:315
 msgid "Model must have slug"
 msgstr ""
 
-#: projects/models.py:844
+#: projects/models.py:903
 msgid "MD5 checksum"
 msgstr ""
 
-#: projects/models.py:874
+#: projects/models.py:933
 msgid "URL to send the webhook to"
 msgstr ""
 
-#: projects/models.py:886
+#: projects/models.py:945
 msgid "Domain"
 msgstr ""
 
-#: projects/models.py:889
+#: projects/models.py:948
 msgid "This Domain was auto-created"
 msgstr ""
 
-#: projects/models.py:892
+#: projects/models.py:951
 msgid "This Domain is a CNAME for the project"
 msgstr ""
 
-#: projects/models.py:896
+#: projects/models.py:956
 msgid "This Domain is the primary one where the documentation is served from"
 msgstr ""
 
-#: projects/models.py:899
+#: projects/models.py:960
 msgid "Use HTTPS"
 msgstr ""
 
-#: projects/models.py:901
+#: projects/models.py:962
 msgid "SSL is enabled for this domain"
 msgstr ""
 
-#: projects/models.py:903
+#: projects/models.py:965
 msgid "Number of times this domain has been hit"
 msgstr ""
 
-#: projects/tasks.py:143
+#: projects/models.py:1019
+msgid "Use latest version of Sphinx"
+msgstr ""
+
+#: projects/models.py:1020
+msgid "Use latest version of setuptools"
+msgstr ""
+
+#: projects/models.py:1021
+msgid "Allow deprecated webhook views"
+msgstr ""
+
+#: projects/models.py:1022
+msgid "Always run pip install --upgrade"
+msgstr ""
+
+#: projects/models.py:1023
+msgid "Skip git submodule checkout"
+msgstr ""
+
+#: projects/models.py:1033
+msgid "Feature identifier"
+msgstr ""
+
+#: projects/models.py:1038
+msgid "Date feature was added"
+msgstr ""
+
+#: projects/models.py:1042
+msgid "Historical default is True"
+msgstr ""
+
+#: projects/tasks.py:99
+#, python-brace-format
+msgid "Repository type \"{repo_type}\" unknown"
+msgstr ""
+
+#: projects/tasks.py:375
 msgid "Builds for this project are temporarily disabled"
 msgstr ""
 
-#: projects/tasks.py:816
+#: projects/tasks.py:1027
 #, python-brace-format
-msgid "Failed: {project.name} ({commit})"
+msgid "Failed: {project[name]} ({commit})"
 msgstr ""
 
-#: projects/tasks.py:818
+#: projects/tasks.py:1029
 #, python-brace-format
-msgid "Failed: {project.name} ({version.verbose_name})"
+msgid "Failed: {project[name]} ({version[verbose_name]})"
 msgstr ""
 
-#: projects/views/private.py:103 projects/views/private.py:119
+#: projects/tasks.py:1213
+#, python-brace-format
+msgid ""
+"This build was terminated due to inactivity. If you continue to encounter "
+"this error, file a support request with and reference this build id ({0})."
+msgstr ""
+
+#: projects/views/private.py:82 projects/views/private.py:98
 msgid "Project settings updated"
 msgstr ""
 
-#: projects/views/private.py:151
+#: projects/views/private.py:131
 msgid "Project versions updated"
 msgstr ""
 
-#: projects/views/private.py:204
+#: projects/views/private.py:183
 msgid "Project deleted"
 msgstr ""
 
-#: projects/views/private.py:289
+#: projects/views/private.py:267
 msgid "The demo project is already imported!"
 msgstr ""
 
-#: projects/views/private.py:298
+#: projects/views/private.py:276
 msgid "Your demo project is currently being imported"
 msgstr ""
 
-#: projects/views/private.py:303
+#: projects/views/private.py:280
 msgid "There was a problem adding the demo project"
 msgstr ""
 
-#: projects/views/private.py:350
+#: projects/views/private.py:333
 #, python-brace-format
 msgid ""
 "There is a problem with your {service} account, try reconnecting your "
 "account on your <a href=\"{url}\">connected services page</a>."
 msgstr ""
 
-#: projects/views/private.py:794
+#: projects/views/private.py:791
 msgid "Project has been opted out from advertisement support"
 msgstr ""
 
@@ -1576,83 +1466,82 @@ msgstr ""
 msgid "redirects"
 msgstr ""
 
-#: redirects/models.py:82
-msgid "Prefix Redirect:"
-msgstr ""
-
-#: redirects/models.py:84
-msgid "Page Redirect:"
-msgstr ""
-
 #: redirects/models.py:87
-#, python-format
-msgid "Redirect: %s"
+msgid "Redirect: {}"
 msgstr ""
 
-#: settings/base.py:197
+#: settings/base.py:209
 msgid "Catalan"
 msgstr ""
 
-#: settings/base.py:198
+#: settings/base.py:210
 msgid "English"
 msgstr ""
 
-#: settings/base.py:199
+#: settings/base.py:211
 msgid "Spanish"
 msgstr ""
 
-#: settings/base.py:200
+#: settings/base.py:212
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: settings/base.py:201
+#: settings/base.py:213
 msgid "Norwegian Bokmål"
 msgstr ""
 
-#: settings/base.py:202
+#: settings/base.py:214
 msgid "French"
 msgstr ""
 
-#: settings/base.py:203
+#: settings/base.py:215
 msgid "Russian"
 msgstr ""
 
-#: settings/base.py:204
+#: settings/base.py:216
 msgid "German"
 msgstr ""
 
-#: settings/base.py:205
+#: settings/base.py:217
 msgid "Galician"
 msgstr ""
 
-#: settings/base.py:206
+#: settings/base.py:218
 msgid "Vietnamese"
 msgstr ""
 
-#: settings/base.py:207
-msgid "Chinese"
+#: settings/base.py:219
+msgid "Simplified Chinese"
 msgstr ""
 
-#: settings/base.py:208
-msgid "Taiwanese"
+#: settings/base.py:220
+msgid "Traditional Chinese"
 msgstr ""
 
-#: settings/base.py:209
+#: settings/base.py:221
 msgid "Japanese"
 msgstr ""
 
-#: settings/base.py:210
+#: settings/base.py:222
 msgid "Ukrainian"
 msgstr ""
 
-#: settings/base.py:211
+#: settings/base.py:223
 msgid "Italian"
 msgstr ""
 
-#: settings/base.py:212
+#: settings/base.py:224
 msgid "Korean"
 msgstr ""
 
+#: templates/401.html:6 templates/404.html:6
+msgid "Maze Found"
+msgstr ""
+
+#: templates/500.html:5
+msgid "Server Error"
+msgstr ""
+
 #: templates/account/email.html:5 templates/account/email.html:9
 #: templates/profiles/base_profile_edit.html:51
 msgid "Change Email"
@@ -1722,32 +1611,43 @@ msgstr ""
 msgid "Verify your email address"
 msgstr ""
 
-#: templates/account/email/password_reset_key_message.html:16
-#: templates/account/email/password_reset_key_message.txt:11
+#: templates/account/email/password_reset_key_message.html:7
+#: templates/account/email/password_reset_key_message.txt:6
 msgid ""
-"If you did not request to reset you password, you can disregard this email."
+"A request has been made to reset your Read the Docs password. To confirm "
+"this reset request, please go to:"
+msgstr ""
+
+#: templates/account/email/password_reset_key_message.html:15
+#: templates/account/email/password_reset_key_message.txt:10
+msgid ""
+"If you did not request to reset your password, you can disregard this email."
 msgstr ""
 
 #: templates/account/email/password_reset_key_subject.txt:3
 msgid "Password reset"
 msgstr ""
 
-#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:21
+#: templates/account/login.html:6 templates/account/login.html:12
+#: templates/account/login.html:23
 msgid "Sign In"
 msgstr ""
 
-#: templates/account/login.html:12
+#: templates/account/login.html:14
 #, python-format
 msgid ""
 "If you have not created an account yet, then please\n"
 "<a href=\"%(signup_url)s\">sign up</a> first."
 msgstr ""
 
-#: templates/account/login.html:22
+#: templates/account/login.html:27
+#, python-format
 msgid ""
-"If you forgot your password, <a href=\"/accounts/password/reset/\">reset it."
-"</a>"
+"If you forgot your password, <a href=\"%(password_reset_url)s\">reset it.</a>"
+msgstr ""
+
+#: templates/account/login.html:31 templates/account/signup.html:28
+msgid "Or"
 msgstr ""
 
 #: templates/account/password_change.html:5
@@ -1757,71 +1657,126 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
+#. Translators: Note, the full sentence goes 'Sign up' 'or' 'Log in'. But unfortunately the three bits have to be separate.
+#: templates/account/signup.html:5 templates/core/home-header.html:17
+msgid "Sign up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid ""
+"Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:24
+msgid ""
+"By signing up, you agree to our <a href=\"https://docs.readthedocs.io/en/"
+"latest/privacy-policy.html\">privacy policy</a>."
+msgstr ""
+
 #: templates/archive/index.html:5
 msgid "Read the Docs Archive"
 msgstr ""
 
-#: templates/base.html:92
-msgid "Docs"
+#: templates/base.html:121
+msgid "Stay Updated"
 msgstr ""
 
-#: templates/base.html:95
-#, python-format
+#: templates/base.html:125
+msgid "Blog"
+msgstr ""
+
+#: templates/base.html:129
 msgid ""
-"\n"
-"        Made by <a href=\"https://docs.readthedocs.io/en/latest/team.html"
-"\">humans</a>. Funded by <a href=\"%(gold_detail)s\">readers like you</a>.\n"
-"        "
+"Sign up for our newsletter to get our latest blog updates delivered to your "
+"inbox weekly."
 msgstr ""
 
-#: templates/base_filter.html:14 templates/core/filter_bar.html:8
-msgid "Filter"
+#: templates/base.html:139
+msgid "Subscribe"
 msgstr ""
 
-#: templates/bookmarks/bookmark_delete.html:4
-#: templates/bookmarks/bookmark_delete.html:6
-#: templates/projects/project_delete.html:4
-#: templates/projects/project_delete.html:6
-#, python-format
-msgid "Delete %(name)s?"
+#: templates/base.html:147
+msgid "Get Involved"
 msgstr ""
 
-#: templates/bookmarks/bookmark_delete.html:9
-#: templates/projects/project_delete.html:9
-#: templates/projects/project_resync_webhook.html:9
-msgid "You sure?"
+#: templates/base.html:151
+msgid "Getting Started Guide"
 msgstr ""
 
-#: templates/bookmarks/bookmark_delete.html:12
-#: templates/projects/project_delete.html:12
-msgid "Delete forever"
+#: templates/base.html:154
+msgid "Documentation"
+msgstr ""
+
+#: templates/base.html:157
+msgid "Contributing"
+msgstr ""
+
+#: templates/base.html:160
+msgid "Team"
 msgstr ""
 
-#: templates/bookmarks/bookmark_list.html:7
-msgid "Bookmarks"
+#: templates/base.html:163
+msgid "Open Source Philosophy"
 msgstr ""
 
-#: templates/bookmarks/bookmark_list.html:20
-msgid "All Bookmarks"
+#: templates/base.html:170
+msgid "Business Info"
 msgstr ""
 
-#: templates/builds/build_detail.html:36
+#: templates/base.html:175
+msgid "Advertise with Us"
+msgstr ""
+
+#: templates/base.html:178
+msgid "Private Hosting"
+msgstr ""
+
+#: templates/base.html:182
+msgid "Supporters"
+msgstr ""
+
+#: templates/base.html:185
+msgid "Privacy Policy"
+msgstr ""
+
+#: templates/base.html:204
+msgid "Read the Docs, Inc & contributors"
+msgstr ""
+
+#: templates/base.html:227
+msgid "Change Language"
+msgstr ""
+
+#: templates/base_filter.html:14 templates/core/filter_bar.html:8
+msgid "Filter"
+msgstr ""
+
+#: templates/builds/build_detail.html:37
 msgid "Completed"
 msgstr ""
 
-#: templates/builds/build_detail.html:41
+#: templates/builds/build_detail.html:42
 msgid "Build took"
 msgstr ""
 
-#: templates/builds/build_detail.html:45
+#: templates/builds/build_detail.html:46
 msgid "seconds"
 msgstr ""
 
-#: templates/builds/build_detail.html:51
+#: templates/builds/build_detail.html:52
 msgid "Built on"
 msgstr ""
 
-#: templates/builds/build_detail.html:58
+#: templates/builds/build_detail.html:60
+msgid "View docs"
+msgstr ""
+
+#: templates/builds/build_detail.html:68
+msgid "View raw"
+msgstr ""
+
+#: templates/builds/build_detail.html:75
 #, python-format
 msgid ""
 "\n"
@@ -1829,56 +1784,66 @@ msgid ""
 "      "
 msgstr ""
 
-#: templates/builds/build_detail.html:86
+#: templates/builds/build_detail.html:107
 msgid "Build completed"
 msgstr ""
 
-#: templates/builds/build_detail.html:91
+#: templates/builds/build_detail.html:112
 msgid "Build failed"
 msgstr ""
 
-#: templates/builds/build_detail.html:99
+#: templates/builds/build_detail.html:121
+#, python-format
+msgid ""
+"\n"
+"              Having trouble with your build environment?\n"
+"              Try <a href=\"%(wipe_url)s\">resetting it</a>.\n"
+"            "
+msgstr ""
+
+#: templates/builds/build_detail.html:131
+#, python-format
+msgid ""
+"\n"
+"              Don't want <em>setup.py install</em> called?\n"
+"              Change the <strong>Install Project</strong> setting in your <a "
+"href=\"%(advanced_url)s\">advanced settings</a>.\n"
+"            "
+msgstr ""
+
+#: templates/builds/build_detail.html:144
 msgid "Show full build output"
 msgstr ""
 
-#: templates/builds/build_detail.html:105
+#: templates/builds/build_detail.html:150
 msgid "Build Output"
 msgstr ""
 
-#: templates/builds/build_detail.html:109
+#: templates/builds/build_detail.html:154
 msgid "Setup Output"
 msgstr ""
 
-#: templates/builds/build_detail.html:114
+#: templates/builds/build_detail.html:159
 msgid "Environment Standard Error"
 msgstr ""
 
-#: templates/builds/build_detail.html:120
+#: templates/builds/build_detail.html:165
 msgid "Build Errors"
 msgstr ""
 
-#: templates/builds/build_detail.html:154
+#: templates/builds/build_detail.html:199
 msgid "Command time:"
 msgstr ""
 
-#: templates/builds/build_detail.html:159
+#: templates/builds/build_detail.html:204
 msgid "Return"
 msgstr ""
 
-#: templates/builds/build_list.html:23
-#, python-format
-msgid ""
-"\n"
-"    Whoa! The build queue is %(queue_length)s tasks long, new builds may "
-"take a while.\n"
-"  "
-msgstr ""
-
-#: templates/builds/build_list.html:46
+#: templates/builds/build_list.html:36
 msgid "Build Version:"
 msgstr ""
 
-#: templates/builds/build_list.html:62
+#: templates/builds/build_list.html:52
 msgid "Recent Builds"
 msgstr ""
 
@@ -1926,24 +1891,24 @@ msgstr ""
 msgid "No objects found"
 msgstr ""
 
-#: templates/core/header.html:29
+#: templates/core/header.html:28
 msgid "My Projects"
 msgstr ""
 
-#: templates/core/header.html:30 templates/projects/project_edit.html:27
+#: templates/core/header.html:29 templates/projects/project_edit.html:13
 #: templates/projects/project_edit_base.html:17
 msgid "Settings"
 msgstr ""
 
-#: templates/core/header.html:31
+#: templates/core/header.html:30
 msgid "Support"
 msgstr ""
 
-#: templates/core/header.html:34 templates/error_header.html:24
+#: templates/core/header.html:33 templates/error_header.html:24
 msgid "Log Out"
 msgstr ""
 
-#: templates/core/header.html:41
+#: templates/core/header.html:39
 msgid "Log In"
 msgstr ""
 
@@ -1951,13 +1916,9 @@ msgstr ""
 msgid "Create, host, and browse documentation."
 msgstr ""
 
-#. Translators: Note, the full sentence goes 'Sign up' 'or' 'Log in'. But unfortunately the three bits have to be separate.
-#: templates/core/home-header.html:17
-msgid "Sign up"
-msgstr ""
-
-#. Translators: The 'or' here is in between 'Submit' and 'delete'.
-#: templates/core/home-header.html:19 templates/projects/project_edit.html:38
+#. Translators: The 'or' here is in between 'Save' and 'Delete project'.
+#: templates/core/home-header.html:19 templates/projects/project_edit.html:24
+#: templates/projects/project_version_detail.html:23
 msgid "or"
 msgstr ""
 
@@ -1968,7 +1929,7 @@ msgstr ""
 #: templates/core/project_bar_base.html:12
 #: templates/core/project_list_detailed.html:35
 #: templates/core/project_list_featured.html:13
-#: templates/projects/project_version_list.html:50
+#: templates/projects/project_version_list.html:49
 msgid "View Docs"
 msgstr ""
 
@@ -2009,9 +1970,12 @@ msgstr ""
 msgid "Downloads"
 msgstr ""
 
+#. Translators: This is about starting a search
 #: templates/core/project_bar_base.html:58
 #: templates/core/project_list_detailed.html:39
 #: templates/core/project_list_featured.html:17
+#: templates/search/elastic_project_search.html:52
+#: templates/search/elastic_search.html:123
 msgid "Search"
 msgstr ""
 
@@ -2029,11 +1993,6 @@ msgid "Versions"
 msgstr ""
 
 #: templates/core/project_bar_base.html:72
-#: templates/projects/project_edit_base.html:29
-msgid "Comments"
-msgstr ""
-
-#: templates/core/project_bar_base.html:73
 #: templates/profiles/base_profile.html:29
 #: templates/profiles/base_profile_edit.html:31
 msgid "Admin"
@@ -2043,74 +2002,88 @@ msgstr ""
 msgid "Repository"
 msgstr ""
 
-#: templates/core/project_detail_right.html:15
+#: templates/core/project_detail_right.html:21
 msgid "Last Built"
 msgstr ""
 
-#: templates/core/project_detail_right.html:22
-msgid "passed"
+#: templates/core/project_detail_right.html:28
+msgid "passed"
+msgstr ""
+
+#: templates/core/project_detail_right.html:30
+msgid "failed"
+msgstr ""
+
+#: templates/core/project_detail_right.html:33
+msgid "Currently Building"
 msgstr ""
 
-#: templates/core/project_detail_right.html:24
-msgid "failed"
+#: templates/core/project_detail_right.html:36
+#: templates/projects/project_dashboard_base.html:72
+msgid "No builds yet"
 msgstr ""
 
-#: templates/core/project_detail_right.html:37
-msgid "Owners"
+#: templates/core/project_detail_right.html:43
+#: templates/projects/project_edit_base.html:21
+#: templates/projects/project_users.html:8
+msgid "Maintainers"
 msgstr ""
 
-#: templates/core/project_detail_right.html:47
+#: templates/core/project_detail_right.html:53
 msgid "Home Page"
 msgstr ""
 
-#: templates/core/project_detail_right.html:55
+#: templates/core/project_detail_right.html:61
 msgid "Badge"
 msgstr ""
 
-#: templates/core/project_detail_right.html:65
+#: templates/core/project_detail_right.html:70
 msgid "Tags"
 msgstr ""
 
-#: templates/core/project_detail_right.html:70
-msgid "No tags"
+#: templates/core/project_detail_right.html:78
+msgid "Project has no tags."
+msgstr ""
+
+#: templates/core/project_detail_right.html:82
+#, python-format
+msgid ""
+"\n"
+"          Add some in your <a href=\"%(edit_url)s\">project settings</a>.\n"
+"          "
 msgstr ""
 
-#: templates/core/project_detail_right.html:77
+#: templates/core/project_detail_right.html:92
 msgid "Project Privacy Level"
 msgstr ""
 
-#: templates/core/project_detail_right.html:86
+#: templates/core/project_detail_right.html:101
 msgid "Short URLs"
 msgstr ""
 
-#: templates/core/project_detail_right.html:97
+#: templates/core/project_detail_right.html:112
 #: templates/projects/project_edit_base.html:23
 #: templates/projects/project_translations.html:12
 msgid "Translations"
 msgstr ""
 
-#: templates/core/project_detail_right.html:108
+#: templates/core/project_detail_right.html:123
 msgid "Sub Projects"
 msgstr ""
 
-#: templates/core/project_detail_right.html:121
+#: templates/core/project_detail_right.html:136
 msgid "'latest' Version"
 msgstr ""
 
-#: templates/core/project_details.html:31
-#, python-format
-msgid " %(slug)s "
-msgstr ""
-
 #: templates/core/project_details.html:43
 #: templates/projects/domain_list.html:26
-#: templates/projects/project_version_list.html:46
-#: templates/projects/project_version_list.html:99
+#: templates/projects/project_version_list.html:45
+#: templates/projects/project_version_list.html:97
 msgid "Edit"
 msgstr ""
 
 #: templates/core/project_details.html:50
-#: templates/projects/project_version_list.html:59
+#: templates/projects/project_version_list.html:58
 msgid "No active versions."
 msgstr ""
 
@@ -2118,6 +2091,10 @@ msgstr ""
 msgid "Build a version"
 msgstr ""
 
+#: templates/core/project_details.html:69
+msgid "Build version"
+msgstr ""
+
 #: templates/core/project_downloads.html:30
 msgid "No downloads for this project."
 msgstr ""
@@ -2144,6 +2121,11 @@ msgstr ""
 msgid "Search all the docs"
 msgstr ""
 
+#: templates/core/widesearchbar.html:12
+#: templates/projects/project_dashboard_base.html:118
+msgid "Search Read the Docs"
+msgstr ""
+
 #. Translators: This is about starting a search
 #: templates/core/widesearchbar.html:16
 msgid "Let's do this."
@@ -2187,65 +2169,116 @@ msgstr ""
 msgid "Thank you for contributing to the quality of this site!"
 msgstr ""
 
-#: templates/homepage.html:7
-msgid "Home"
+#: templates/homepage.html:8
+msgid ""
+"Read the Docs simplifies technical documentation by automating building, "
+"versioning, and hosting for you. Build up-to-date documentation for the web, "
+"print, and offline use on every version control push automatically."
 msgstr ""
 
-#: templates/homepage.html:43
-msgid "What is this place?"
+#: templates/homepage.html:11
+msgid "Home"
 msgstr ""
 
 #: templates/homepage.html:45
+msgid "Technical documentation lives here"
+msgstr ""
+
+#: templates/homepage.html:47
+msgid ""
+"\n"
+"      Read the Docs simplifies software documentation by automating "
+"building,\n"
+"      versioning, and hosting of your docs for you.\n"
+"      "
+msgstr ""
+
+#: templates/homepage.html:60
+#, python-format
 msgid ""
 "\n"
-"Read the Docs hosts documentation, making it fully searchable and easy to "
-"find.\n"
-"You can import your docs using any major version control system, including "
-"Mercurial, Git, Subversion, and Bazaar.\n"
-"We support <a href=\"http://docs.readthedocs.io/en/latest/webhooks.html"
-"\">webhooks</a> so your docs get built when you commit code.\n"
-"There's also support for <a href=\"http://docs.readthedocs.io/en/latest/"
-"versions.html\">versioning</a> so you can build docs from tags and branches "
-"of your code in your repository. \n"
+"        We will host your documentation for free forever.\n"
+"        There are no tricks. We help %(projects_count_intcomma)s open source "
+"projects\n"
+"        share their docs.\n"
+"        "
 msgstr ""
 
-#: templates/homepage.html:53
+#: templates/homepage.html:71
 msgid ""
 "\n"
-"  Hosting documentation is free and simple,\n"
-"  <a href=\"https://docs.readthedocs.io/en/latest/getting_started.html"
-"\">read our guide</a>\n"
-"  to get started!\n"
+"        Whenever you push code to your favorite version control system,\n"
+"        whether that is Git, Mercurial, Bazaar, or Subversion, we will\n"
+"        automatically build your docs so your code and documentation are\n"
+"        never out of sync.\n"
+"        "
 msgstr ""
 
-#: templates/homepage.html:60
+#: templates/homepage.html:86
 msgid ""
 "\n"
-"Read the Docs is <b>community supported</b>. \n"
-"It depends on users like you to contribute to development,\n"
-"support,\n"
-"and operations.\n"
-"You can learn more about how to <a href=\"https://docs.readthedocs.io/en/"
-"latest/contribute.html\">contribute</a> in our docs.\n"
-"Thanks so much to our wonderful <a href=\"https://docs.readthedocs.io/en/"
-"latest/team.html\">community team</a> who helps us run the site.\n"
-"Read the Docs wouldn't be possible without them.\n"
-"Please consider joining today,\n"
-"as we always need more contributors to the project.\n"
+"        Of course we build and host your docs for the web, but they are\n"
+"        also vieweable as PDFs, as single page HTML, and for eReaders.\n"
+"        No additional configuration is required.\n"
+"        "
 msgstr ""
 
-#: templates/homepage.html:85
-msgid "Featured Projects"
+#: templates/homepage.html:96
+msgid ""
+"\n"
+"        We can host and build multiple versions of your docs so having a\n"
+"        1.0 version of your docs and a 2.0 version of your docs is as easy\n"
+"        as having a separate branch or tag in your version control system.\n"
+"        "
+msgstr ""
+
+#: templates/homepage.html:109
+msgid "Getting started guide"
 msgstr ""
 
-#: templates/homepage.html:106
-msgid "Recently updated projects"
+#: templates/homepage.html:121
+msgid "Featured Projects"
 msgstr ""
 
-#: templates/homepage.html:122
+#: templates/homepage.html:135
 msgid "Read the Docs is funded by the community"
 msgstr ""
 
+#: templates/homepage.html:142
+#, python-format
+msgid ""
+"\n"
+"    Read the Docs is a huge resource that millions of developers rely on\n"
+"    for software documentation. It would not be possible without the\n"
+"    support of our\n"
+"    <a href=\"%(sponsors_url)s\">sponsors</a>,\n"
+"    <a href=\"%(advertising_url)s\">advertisers</a>,\n"
+"    and <a href=\"%(gold_detail)s\">readers like you</a>.\n"
+"    "
+msgstr ""
+
+#: templates/homepage.html:153
+msgid ""
+"\n"
+"      Read the Docs is <strong>community supported</strong>.\n"
+"      It depends on users like you to contribute to development, support, "
+"and operations.\n"
+"      You can learn more about how to <a href=\"https://docs.readthedocs.io/"
+"en/latest/contribute.html\">contribute</a> in our docs.\n"
+"      Thanks so much to our wonderful <a href=\"https://docs.readthedocs.io/"
+"en/latest/team.html\">community team</a> who helps us run the site.\n"
+"      Read the Docs wouldn't be possible without them.\n"
+"      "
+msgstr ""
+
+#: templates/homepage.html:163
+msgid ""
+"\n"
+"      Hosting for the project is graciously provided by <a href=\"http://www."
+"rackspace.com/cloud/\">Rackspace</a>.\n"
+"      "
+msgstr ""
+
 #: templates/notifications/send_notification_form.html:6
 msgid "Send Email"
 msgstr ""
@@ -2283,15 +2316,15 @@ msgstr ""
 
 #: templates/pagination/pagination.html:6
 #: templates/pagination/pagination.html:8
-#: templates/projects/project_import.html:189
-#: templates/projects/project_import.html:195
+#: templates/projects/project_import.html:172
+#: templates/projects/project_import.html:178
 msgid "previous"
 msgstr ""
 
 #: templates/pagination/pagination.html:22
 #: templates/pagination/pagination.html:24
-#: templates/projects/project_import.html:199
-#: templates/projects/project_import.html:205
+#: templates/projects/project_import.html:182
+#: templates/projects/project_import.html:188
 msgid "next"
 msgstr ""
 
@@ -2332,9 +2365,73 @@ msgid "Connected Services"
 msgstr ""
 
 #: templates/profiles/base_profile_edit.html:52
+#: templates/profiles/private/delete_account.html:5
+#: templates/profiles/private/delete_account.html:9
+#: templates/profiles/private/delete_account.html:18
+msgid "Delete Account"
+msgstr ""
+
+#: templates/profiles/base_profile_edit.html:53
 msgid "Gold"
 msgstr ""
 
+#: templates/profiles/base_profile_edit.html:55
+#: templates/projects/project_edit_base.html:28
+msgid "Advertising"
+msgstr ""
+
+#: templates/profiles/private/advertising_profile.html:5
+#: templates/profiles/private/advertising_profile.html:9
+msgid "Set advertising preferences"
+msgstr ""
+
+#: templates/profiles/private/advertising_profile.html:13
+#: templates/projects/project_advertising.html:16
+msgid ""
+"\n"
+"      Read the Docs is an open source project.\n"
+"      In order to maintain service, we rely on both the\n"
+"      support of our users, and from sponsor support.\n"
+"    "
+msgstr ""
+
+#: templates/profiles/private/advertising_profile.html:21
+#: templates/projects/project_advertising.html:50
+msgid ""
+"\n"
+"      For more details on advertising on Read the Docs\n"
+"      including the privacy protections we have in place for users\n"
+"      and community advertising we run on behalf of the open source "
+"community,\n"
+"      see <a href=\"https://docs.readthedocs.io/en/latest/ethical-"
+"advertising.html\">our documentation</a>.\n"
+"    "
+msgstr ""
+
+#: templates/profiles/private/advertising_profile.html:31
+msgid ""
+"\n"
+"        <strong>Note:</strong>\n"
+"        Since you are a Gold Member or donor, you <strong>will not</strong> "
+"see advertising as long as you are logged-in.\n"
+"        Thank you for supporting Read the Docs.\n"
+"      "
+msgstr ""
+
+#: templates/profiles/private/advertising_profile.html:40
+#, python-format
+msgid ""
+"\n"
+"        You may remove ads completely by becoming a <a href=\"%(gold_detail)s"
+"\">Gold member to Read the Docs</a>.\n"
+"      "
+msgstr ""
+
+#: templates/profiles/private/advertising_profile.html:49
+#: templates/projects/project_advertising.html:133
+msgid "Update advertisement preference"
+msgstr ""
+
 #: templates/profiles/private/create_profile.html:5
 #: templates/profiles/private/create_profile.html:10
 msgid "Create your profile"
@@ -2344,6 +2441,10 @@ msgstr ""
 msgid "Create it!"
 msgstr ""
 
+#: templates/profiles/private/delete_account.html:16
+msgid "Be careful! This can not be undone!"
+msgstr ""
+
 #: templates/profiles/private/edit_profile.html:5
 #: templates/profiles/private/edit_profile.html:9
 msgid "Edit your profile"
@@ -2367,7 +2468,7 @@ msgid "Add an alias for a project version."
 msgstr ""
 
 #: templates/projects/alias_edit.html:16
-#: templates/projects/project_create.html:34
+#: templates/projects/project_create.html:19
 msgid "Create"
 msgstr ""
 
@@ -2420,16 +2521,25 @@ msgstr ""
 msgid "Add new Domain"
 msgstr ""
 
+#: templates/projects/domain_list.html:38
+#: templates/projects/project_import.html:157
+#: templates/projects/project_notifications.html:69
+#: templates/projects/project_notifications.html:80
+#: templates/projects/project_redirects.html:114
+#: templates/projects/project_translations.html:53
+#: templates/projects/project_users.html:51
+msgid "Add"
+msgstr ""
+
 #: templates/projects/import_base.html:4
 msgid "Add a Project"
 msgstr ""
 
 #: templates/projects/import_base.html:27
-#: templates/search/elastic_project_search.html:123
-#: templates/search/elastic_project_search.html:125
+#: templates/search/elastic_project_search.html:105
+#: templates/search/elastic_project_search.html:107
 #: templates/search/elastic_search.html:196
-#: templates/search/elastic_search.html:198 templates/search/search.html:58
-#: templates/search/search.html:60
+#: templates/search/elastic_search.html:198
 msgid "Next"
 msgstr ""
 
@@ -2438,11 +2548,10 @@ msgid "Finish"
 msgstr ""
 
 #: templates/projects/import_base.html:33
-#: templates/search/elastic_project_search.html:117
-#: templates/search/elastic_project_search.html:119
+#: templates/search/elastic_project_search.html:99
+#: templates/search/elastic_project_search.html:101
 #: templates/search/elastic_search.html:190
-#: templates/search/elastic_search.html:192 templates/search/search.html:52
-#: templates/search/search.html:54
+#: templates/search/elastic_search.html:192
 msgid "Previous"
 msgstr ""
 
@@ -2460,11 +2569,11 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/projects/import_extra.html:20
+#: templates/projects/import_extra.html:5
 msgid "Project Extra Details"
 msgstr ""
 
-#: templates/projects/import_extra.html:23
+#: templates/projects/import_extra.html:8
 msgid ""
 "\n"
 "      Here are a few more project options that you may need to configure.\n"
@@ -2522,7 +2631,7 @@ msgid "Token"
 msgstr ""
 
 #: templates/projects/integration_list.html:38
-msgid "No intergrations are currently configured"
+msgid "No integrations are currently configured."
 msgstr ""
 
 #: templates/projects/integration_webhook_detail.html:5
@@ -2580,6 +2689,10 @@ msgid ""
 "      "
 msgstr ""
 
+#: templates/projects/integration_webhook_detail.html:76
+msgid "Recent Activity"
+msgstr ""
+
 #: templates/projects/integration_webhook_detail.html:84
 #, python-format
 msgid ""
@@ -2664,15 +2777,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: templates/projects/onboard_detail.html:21
+#: templates/projects/onboard_detail.html:22
 msgid "Build latest version"
 msgstr ""
 
-#: templates/projects/onboard_detail.html:29
+#: templates/projects/onboard_detail.html:30
 msgid "Your documentation is ready to use"
 msgstr ""
 
-#: templates/projects/onboard_detail.html:33
+#: templates/projects/onboard_detail.html:34
 msgid ""
 "\n"
 "              Your documentation has been built.\n"
@@ -2684,11 +2797,15 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/projects/onboard_detail.html:46
+#: templates/projects/onboard_detail.html:42
+msgid "View your documentation"
+msgstr ""
+
+#: templates/projects/onboard_detail.html:47
 msgid "Your documentation failed to build"
 msgstr ""
 
-#: templates/projects/onboard_detail.html:50
+#: templates/projects/onboard_detail.html:51
 msgid ""
 "\n"
 "              There was a problem building your documentation,\n"
@@ -2700,11 +2817,15 @@ msgid ""
 "            "
 msgstr ""
 
-#: templates/projects/onboard_detail.html:63
+#: templates/projects/onboard_detail.html:60
+msgid "View build output"
+msgstr ""
+
+#: templates/projects/onboard_detail.html:64
 msgid "Your documentation is building"
 msgstr ""
 
-#: templates/projects/onboard_detail.html:66
+#: templates/projects/onboard_detail.html:67
 msgid ""
 "\n"
 "          You'll be able to view your documentation in a minute or two,\n"
@@ -2712,6 +2833,10 @@ msgid ""
 "        "
 msgstr ""
 
+#: templates/projects/onboard_import.html:5
+msgid "Ready to share your documentation"
+msgstr ""
+
 #: templates/projects/onboard_import.html:10
 #, python-format
 msgid ""
@@ -2724,30 +2849,41 @@ msgid ""
 "        "
 msgstr ""
 
-#: templates/projects/project_advanced.html:22
+#: templates/projects/onboard_import.html:19
+#, python-format
+msgid ""
+"\n"
+"          Want to try a demo? <a href=\"%(import_demo_url)s\">Import our own "
+"demo project</a>.\n"
+"        "
+msgstr ""
+
+#: templates/projects/onboard_import.html:24
+#: templates/projects/project_dashboard_base.html:53
+msgid "Import a Project"
+msgstr ""
+
+#: templates/projects/project_advanced.html:7
 msgid "Edit Advanced Project Settings"
 msgstr ""
 
-#: templates/projects/project_advanced.html:27
+#: templates/projects/project_advanced.html:12
 #: templates/projects/project_edit_base.html:18
 msgid "Advanced Settings"
 msgstr ""
 
+#: templates/projects/project_advanced.html:18
+#: templates/projects/project_edit.html:22
+#: templates/projects/project_version_detail.html:22
+#: templates/projects/project_versions.html:53
+msgid "Save"
+msgstr ""
+
 #: templates/projects/project_advertising.html:5
 #: templates/projects/project_advertising.html:12
 msgid "Documentation Advertising"
 msgstr ""
 
-#: templates/projects/project_advertising.html:16
-msgid ""
-"\n"
-"      Read the Docs is an open source project, maintained and operated by\n"
-"      full-time volunteers. In order to maintain service, we rely on both "
-"the\n"
-"      support of our users, and from sponsor support.\n"
-"    "
-msgstr ""
-
 #: templates/projects/project_advertising.html:24
 msgid ""
 "\n"
@@ -2780,22 +2916,11 @@ msgid ""
 "      "
 msgstr ""
 
-#: templates/projects/project_advertising.html:50
-msgid ""
-"\n"
-"      For more information on our stance on sponsor advertisements, we "
-"wrote\n"
-"      more about our stance\n"
-"      <a href=\"https://blog.readthedocs.com/ads-on-read-the-docs/\">on our "
-"blog</a>.\n"
-"    "
-msgstr ""
-
-#: templates/projects/project_advertising.html:57
+#: templates/projects/project_advertising.html:58
 msgid "Opting out"
 msgstr ""
 
-#: templates/projects/project_advertising.html:60
+#: templates/projects/project_advertising.html:61
 msgid ""
 "\n"
 "      If you do not wish to support Read the Docs with use of this ad "
@@ -2804,7 +2929,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/projects/project_advertising.html:68
+#: templates/projects/project_advertising.html:69
 msgid ""
 "\n"
 "        If you have an open source project, and can contribute financially,\n"
@@ -2813,11 +2938,11 @@ msgid ""
 "      "
 msgstr ""
 
-#: templates/projects/project_advertising.html:75
+#: templates/projects/project_advertising.html:76
 msgid "I can contribute financially"
 msgstr ""
 
-#: templates/projects/project_advertising.html:80
+#: templates/projects/project_advertising.html:81
 msgid ""
 "\n"
 "        If your project is an open source project, you most certainly also\n"
@@ -2828,11 +2953,11 @@ msgid ""
 "      "
 msgstr ""
 
-#: templates/projects/project_advertising.html:88
+#: templates/projects/project_advertising.html:89
 msgid "I can contribute my time"
 msgstr ""
 
-#: templates/projects/project_advertising.html:93
+#: templates/projects/project_advertising.html:94
 msgid ""
 "\n"
 "        If you are part of a company that uses Read the Docs to host\n"
@@ -2842,15 +2967,15 @@ msgid ""
 "      "
 msgstr ""
 
-#: templates/projects/project_advertising.html:101
+#: templates/projects/project_advertising.html:102
 msgid "Learn more about a paid plan"
 msgstr ""
 
-#: templates/projects/project_advertising.html:106
+#: templates/projects/project_advertising.html:107
 msgid "Still can't help?"
 msgstr ""
 
-#: templates/projects/project_advertising.html:109
+#: templates/projects/project_advertising.html:110
 msgid ""
 "\n"
 "      If you can't contribute your support for your open source project, "
@@ -2864,7 +2989,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/projects/project_advertising.html:119
+#: templates/projects/project_advertising.html:120
 msgid ""
 "\n"
 "      If you are a company hosting commercial documentation on our "
@@ -2877,10 +3002,6 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/projects/project_advertising.html:132
-msgid "Update advertisement preference"
-msgstr ""
-
 #: templates/projects/project_analytics.html:47
 msgid "Analytics"
 msgstr ""
@@ -2893,30 +3014,21 @@ msgstr ""
 msgid "Pages"
 msgstr ""
 
-#: templates/projects/project_comments_settings.html:5
-#: templates/projects/project_comments_settings.html:12
-msgid "Comments Settings"
-msgstr ""
-
-#: templates/projects/project_comments_settings.html:16
-msgid "Settings for comments and moderation."
-msgstr ""
-
-#: templates/projects/project_create.html:21
+#: templates/projects/project_create.html:6
 msgid "Create a new project"
 msgstr ""
 
-#: templates/projects/project_create.html:24
+#: templates/projects/project_create.html:9
 msgid "Create a New Project"
 msgstr ""
 
-#: templates/projects/project_create.html:29
+#: templates/projects/project_create.html:14
 msgid ""
 "Create new documentation here. If you already have docs in a public "
 "repository,"
 msgstr ""
 
-#: templates/projects/project_create.html:30
+#: templates/projects/project_create.html:15
 msgid "import an existing project"
 msgstr ""
 
@@ -2928,10 +3040,6 @@ msgstr ""
 msgid "Important Versions"
 msgstr ""
 
-#: templates/projects/project_dashboard_base.html:72
-msgid "No builds yet"
-msgstr ""
-
 #: templates/projects/project_dashboard_base.html:77
 #, python-format
 msgid ""
@@ -2953,6 +3061,11 @@ msgstr ""
 msgid "failing"
 msgstr ""
 
+#: templates/projects/project_dashboard_base.html:134
+#: templates/projects/project_dashboard_base.html:143
+msgid "Connect your Accounts"
+msgstr ""
+
 #: templates/projects/project_dashboard_base.html:137
 msgid ""
 "\n"
@@ -2961,17 +3074,42 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/projects/project_edit.html:22
-msgid "Edit Project"
+#: templates/projects/project_dashboard_base.html:153
+msgid "Learn More"
+msgstr ""
+
+#: templates/projects/project_dashboard_base.html:155
+#, python-format
+msgid ""
+"\n"
+"          Check out the <a href=\"%(rtd_docs_url)s\">documentation for Read "
+"the Docs</a>.\n"
+"          It contains lots of information about how to get the most out of "
+"RTD.\n"
+"        "
 msgstr ""
 
-#: templates/projects/project_edit.html:39
-msgid "delete"
+#: templates/projects/project_delete.html:4
+#: templates/projects/project_delete.html:6
+#, python-format
+msgid "Delete %(name)s?"
 msgstr ""
 
-#: templates/projects/project_edit_base.html:21
-#: templates/projects/project_users.html:8
-msgid "Maintainers"
+#: templates/projects/project_delete.html:9
+#: templates/projects/project_resync_webhook.html:9
+msgid "You sure?"
+msgstr ""
+
+#: templates/projects/project_delete.html:12
+msgid "Delete forever"
+msgstr ""
+
+#: templates/projects/project_edit.html:8
+msgid "Edit Project"
+msgstr ""
+
+#: templates/projects/project_edit.html:25
+msgid "Delete project"
 msgstr ""
 
 #: templates/projects/project_edit_base.html:22
@@ -2993,10 +3131,6 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: templates/projects/project_edit_base.html:27
-msgid "Advertising"
-msgstr ""
-
 #: templates/projects/project_embed.html:48
 msgid "Embed API"
 msgstr ""
@@ -3006,7 +3140,6 @@ msgid "Embed content into any site on the internet dynamically."
 msgstr ""
 
 #: templates/projects/project_embed.html:55
-#: templates/search/faceted_results.html:54
 msgid "File"
 msgstr ""
 
@@ -3030,72 +3163,60 @@ msgstr ""
 msgid "Import a Remote Repository"
 msgstr ""
 
-#: templates/projects/project_import.html:49
+#: templates/projects/project_import.html:50
 msgid "There was an error with your request:"
 msgstr ""
 
-#: templates/projects/project_import.html:62
+#: templates/projects/project_import.html:63
 msgid "Refresh your accounts"
 msgstr ""
 
-#: templates/projects/project_import.html:71
+#: templates/projects/project_import.html:72
 msgid "Import a Repository"
 msgstr ""
 
-#: templates/projects/project_import.html:83
+#: templates/projects/project_import.html:84
 #, python-format
 msgid ""
 "No remote repositories found, try <a href=\"#\" %(binding)s>refreshing your "
 "accounts</a>."
 msgstr ""
 
-#: templates/projects/project_import.html:90
+#: templates/projects/project_import.html:91
 msgid ""
 "You don't currently have any connected accounts. Connect your account to be "
 "able to easily set up projects."
 msgstr ""
 
-#: templates/projects/project_import.html:102
-msgid "Connect to GitHub"
-msgstr ""
-
-#: templates/projects/project_import.html:113
-msgid "Connect to Bitbucket"
-msgstr ""
-
-#: templates/projects/project_import.html:147
+#: templates/projects/project_import.html:130
 msgid "This repository requires admin access to import"
 msgstr ""
 
-#: templates/projects/project_import.html:156
+#: templates/projects/project_import.html:139
 msgid "Locked"
 msgstr ""
 
-#: templates/projects/project_import.html:165
+#: templates/projects/project_import.html:148
 msgid "This repository has already been imported"
 msgstr ""
 
-#: templates/projects/project_import.html:166
+#: templates/projects/project_import.html:149
 msgctxt "verb, action to see in detail"
 msgid "\"View\""
 msgstr ""
 
-#: templates/projects/project_import.html:174
-msgid "Add"
-msgstr ""
-
-#: templates/projects/project_import.html:218
+#: templates/projects/project_import.html:201
 msgid ""
 "You can import your project manually if it isn't listed here or connected to "
 "one of your accounts."
 msgstr ""
 
-#: templates/projects/project_import.html:225
+#: templates/projects/project_import.html:208
 msgid "Import Manually"
 msgstr ""
 
-#: templates/projects/project_import.html:232
-msgid "Filter by Organization"
+#: templates/projects/project_import.html:215
+msgid "Filter repositories"
 msgstr ""
 
 #: templates/projects/project_list.html:9
@@ -3167,16 +3288,26 @@ msgid "Edit Translations"
 msgstr ""
 
 #: templates/projects/project_translations.html:16
+msgid "To add a translation to your project, select a project below."
+msgstr ""
+
+#: templates/projects/project_translations.html:23
+#, python-format
 msgid ""
-"This allows you to add translations to your project. Select the project "
-"below that is a translation of your current project."
+"This project is already configured as the <code>%(language)s</code> "
+"translation of \"%(main_project)s\". Nested translations are not supported."
+msgstr ""
+
+#: templates/projects/project_translations.html:31
+#, python-format
+msgid "View translations of \"%(main_project)s\"."
 msgstr ""
 
-#: templates/projects/project_translations.html:19
+#: templates/projects/project_translations.html:37
 msgid "Existing Translations"
 msgstr ""
 
-#: templates/projects/project_translations.html:31
+#: templates/projects/project_translations.html:49
 msgid "Choose which project you would like to add as a translation."
 msgstr ""
 
@@ -3211,20 +3342,19 @@ msgstr ""
 msgid "%(version_name)s"
 msgstr ""
 
-#: templates/projects/project_version_list.html:24
-msgid "Active Versions"
+#: templates/projects/project_version_detail.html:24
+msgid "wipe "
 msgstr ""
 
-#: templates/projects/project_version_list.html:45
-#: templates/projects/project_version_list.html:98
-msgid "Wipe"
+#: templates/projects/project_version_list.html:24
+msgid "Active Versions"
 msgstr ""
 
-#: templates/projects/project_version_list.html:72
+#: templates/projects/project_version_list.html:71
 msgid "Inactive Versions"
 msgstr ""
 
-#: templates/projects/project_version_list.html:96
+#: templates/projects/project_version_list.html:95
 msgid "Clean"
 msgstr ""
 
@@ -3275,11 +3405,7 @@ msgstr ""
 msgid "View subprojects of %(project)s"
 msgstr ""
 
-#: templates/projects/projectrelationship_list.html:60
-msgid "Project page"
-msgstr ""
-
-#: templates/projects/projectrelationship_list.html:70
+#: templates/projects/projectrelationship_list.html:79
 msgid "No subprojects are currently configured"
 msgstr ""
 
@@ -3323,81 +3449,37 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: templates/search/base_facet.html:5 templates/search/search.html:5
-#, python-format
-msgid "Search: %(query)s"
-msgstr ""
-
-#. Translators: This is about starting a search
-#: templates/search/base_facet.html:27
-#: templates/search/elastic_project_search.html:70
-#: templates/search/elastic_search.html:123 templates/search/search.html:17
-msgid "Go crazy."
-msgstr ""
-
-#: templates/search/base_search.html:9 templates/search/faceted_results.html:49
-msgid "Project:"
-msgstr ""
-
-#: templates/search/base_search.html:14
-msgid "File:"
-msgstr ""
-
-#: templates/search/base_search.html:24
-#: templates/search/elastic_project_search.html:101
-#: templates/search/elastic_search.html:174
-#: templates/search/faceted_results.html:63
-msgid "No results found. Bummer."
-msgstr ""
-
 #: templates/search/elastic_project_search.html:5
 #: templates/search/elastic_search.html:5
 #, python-format
 msgid "Search: %(query)s "
 msgstr ""
 
-#: templates/search/elastic_project_search.html:84
-#: templates/search/elastic_search.html:137 templates/search/search.html:31
+#: templates/search/elastic_project_search.html:66
+#: templates/search/elastic_search.html:137
 #, python-format
 msgid "Results for %(query)s"
 msgstr ""
 
-#: templates/search/faceted_author.html:8
-msgid "By Author"
-msgstr ""
-
-#: templates/search/faceted_author.html:13
-msgid "Author"
-msgstr ""
-
-#: templates/search/faceted_author.html:21
-msgid "No author facets."
-msgstr ""
-
-#: templates/search/faceted_results.html:7
-#, python-format
-msgid "%(count)s Results for %(query)s"
-msgstr ""
-
-#: templates/search/faceted_results.html:7
-msgid "No search term entered"
-msgstr ""
-
-#. Translators: The refers to filtering a search by using facets
-#: templates/search/faceted_results.html:15
-msgid "Filtered by"
+#: templates/search/elastic_project_search.html:83
+#: templates/search/elastic_search.html:174
+msgid "No results found. Bummer."
 msgstr ""
 
-#: templates/search/faceted_results.html:18
-msgid "remove"
+#: templates/security.html:5
+msgid "Security"
 msgstr ""
 
-#: templates/search/faceted_results.html:21
-msgid "Filter by Project"
+#: templates/security.html:9
+msgid "Security at Read the Docs"
 msgstr ""
 
-#: templates/search/faceted_results.html:32
-msgid "No project facets."
+#: templates/security.html:11
+msgid ""
+"\n"
+"  For more details on security at Read the Docs or to report a security "
+"issue, please see our <a href=\"https://docs.readthedocs.io/en/latest/"
+"security.html\">security policy</a>.\n"
 msgstr ""
 
 #: templates/socialaccount/authentication_error.html:5
@@ -3438,7 +3520,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"             Connect to %(brand_name)s\n"
+"             %(verbiage)s %(brand_name)s\n"
 "           "
 msgstr ""
 
@@ -3446,6 +3528,33 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"           Connect to %(provider_name)s\n"
+"           %(verbiage)s %(provider_name)s\n"
 "         "
 msgstr ""
+
+#: templates/wipe_version.html:16
+#, python-format
+msgid ""
+"\n"
+"    Remove build environment for <em>%(slug)s</em> version.\n"
+msgstr ""
+
+#: templates/wipe_version.html:23
+msgid ""
+"\n"
+"        Your project environment has been wiped.\n"
+"    "
+msgstr ""
+
+#: templates/wipe_version.html:28
+msgid ""
+"\n"
+"        Having trouble getting your documentation build to complete?  By "
+"clicking on the button below you'll clean out your build checkouts and "
+"environment, but not your generated documentation.\n"
+"    "
+msgstr ""
+
+#: templates/wipe_version.html:33
+msgid "Wipe"
+msgstr ""