diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 9446b09c..8cdf87ff 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -140,6 +140,7 @@ AUTH_PASSWORD_VALIDATORS = [
 LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
+    ('fr-fr', _('French')),
 ]
 
 
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 2280938b..10682347 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -95,7 +95,8 @@
                 {% include 'snippets/trimmed_text.html' with full=book|book_description %}
 
                 {% if request.user.is_authenticated and perms.bookwyrm.edit_book and not book|book_description %}
-                {% include 'snippets/toggle/open_button.html' with text="Add description" controls_text="add-description" controls_uid=book.id focus="id_description" hide_active=True id="hide-description" %}
+                {% trans 'Add Description' as button_text %}
+                {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="add-description" controls_uid=book.id focus="id_description" hide_active=True id="hide-description" %}
 
                 <div class="box hidden" id="add-description-{{ book.id }}">
                     <form name="add-description" method="POST" action="/add-description/{{ book.id }}">
@@ -106,7 +107,8 @@
                         </p>
                         <div class="field">
                             <button class="button is-primary" type="submit">{% trans "Save" %}</button>
-                            {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="add-description" controls_uid=book.id hide_inactive=True %}
+                            {% trans "Cancel" as button_text %}
+                            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="add-description" controls_uid=book.id hide_inactive=True %}
                         </div>
                     </form>
                 </div>
@@ -139,7 +141,8 @@
                 <header class="columns">
                     <h2 class="column title is-5 mb-1">{% trans "Your reading activity" %}</h2>
                     <div class="column is-narrow">
-                        {% include 'snippets/toggle/open_button.html' with text="Add read dates" icon="plus" class="is-small" controls_text="add-readthrough" %}
+                        {% trans "Add read dates" as button_text %}
+                        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" class="is-small" controls_text="add-readthrough" %}
                     </div>
                 </header>
                 {% if not readthroughs.exists %}
@@ -153,7 +156,8 @@
                                 <button class="button is-primary" type="submit">{% trans "Create" %}</button>
                             </div>
                             <div class="control">
-                                {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="add-readthrough" %}
+                                {% trans "Cancel" as button_text %}
+                                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="add-readthrough" %}
                             </div>
                         </div>
                     </form>
diff --git a/bookwyrm/templates/components/inline_form.html b/bookwyrm/templates/components/inline_form.html
index 6a244ffd..40915a92 100644
--- a/bookwyrm/templates/components/inline_form.html
+++ b/bookwyrm/templates/components/inline_form.html
@@ -1,10 +1,12 @@
+{% load i18n %}
 <section class="card hidden {{ class }}" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
     <header class="card-header has-background-white-ter">
         <h2 class="card-header-title" tabindex="0" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}-header">
             {% block header %}{% endblock %}
         </h2>
         <span class="card-header-icon">
-        {% include 'snippets/toggle/toggle_button.html' with label="Close" class="delete" nonbutton=True controls_text=controls_text %}
+            {% trans "Close" as button_text %}
+            {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text=controls_text %}
         </span>
     </header>
     <section class="card-content content">
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 04e4ce48..7f35d2f3 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -48,7 +48,8 @@
                         <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
                     </p>
                     <div class="card-header-icon is-hidden-tablet">
-                        {% include 'snippets/toggle/toggle_button.html' with label="close" controls_text="book" controls_uid=book.id class="delete" nonbutton=True pressed=True %}
+                        {% trans "Close" as button_text %}
+                        {% include 'snippets/toggle/toggle_button.html' with label=button_text controls_text="book" controls_uid=book.id class="delete" nonbutton=True pressed=True %}
                     </div>
                 </div>
                 <div class="card-content">
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 0807dea8..5e967f41 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -8,7 +8,8 @@
     </div>
     {% if is_self and goal %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Edit goal" icon="pencil" controls_text="show-edit-goal" focus="edit-form-header" %}
+        {% trans "Edit Goal" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="show-edit-goal" focus="edit-form-header" %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bc67c81e..bc2e7e09 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -30,7 +30,7 @@
         <form class="navbar-item column" action="/search/">
             <div class="field has-addons">
                 <div class="control">
-                    <input aria-label="Search for a book or user" id="search-input" class="input" type="text" name="q" placeholder="Search for a book or user" value="{{ query }}">
+                    <input aria-label="{% trans 'Search for a book or user' %}" id="search-input" class="input" type="text" name="q" placeholder="{% trans 'Search for a book or user' %}" value="{{ query }}">
                 </div>
                 <div class="control">
                     <button class="button" type="submit">
@@ -76,22 +76,22 @@
                 <ul class="navbar-dropdown" id="navbar-dropdown">
                     <li>
                         <a href="/direct-messages" class="navbar-item">
-                            Direct messages
+                            {% trans "Direct Messages" %}
                         </a>
                     </li>
                     <li>
                         <a href="/user/{{request.user.localname}}" class="navbar-item">
-                            Profile
+                            {% trans 'Profile' %}
                         </a>
                     </li>
                     <li>
                         <a href="/preferences/profile" class="navbar-item">
-                            Settings
+                            {% trans 'Settings' %}
                         </a>
                     </li>
                     <li>
                         <a href="/import" class="navbar-item">
-                            Import books
+                            {% trans 'Import Books' %}
                         </a>
                     </li>
                     {% if perms.bookwyrm.create_invites or perms.bookwyrm.edit_instance_settings%}
@@ -100,21 +100,21 @@
                     {% if perms.bookwyrm.create_invites %}
                     <li>
                         <a href="{% url 'settings-invites' %}" class="navbar-item">
-                            Invites
+                            {% trans 'Invites' %}
                         </a>
                     </li>
                     {% endif %}
                     {% if perms.bookwyrm.edit_instance_settings %}
                     <li>
                         <a href="{% url 'settings-site' %}" class="navbar-item">
-                            Site Configuration
+                            {% trans 'Site Configuration' %}
                         </a>
                     </li>
                     {% endif %}
                     <hr class="navbar-divider">
                     <li>
                         <a href="/logout" class="navbar-item">
-                            Log out
+                            {% trans 'Log out' %}
                         </a>
                     </li>
                 </ul>
@@ -195,7 +195,7 @@
             </div>
             {% endif %}
             <div class="column">
-                BookWyrm is open source software. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.
+                {% trans 'BookWyrm is open source software. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.' %}
             </div>
         </div>
     </div>
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index e48364f4..907f81f7 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -14,7 +14,8 @@
     </div>
     {% if request.user == list.user %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="edit-list" focus="edit-list-header" %}
+        {% trans "Edit List" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-list" focus="edit-list-header" %}
     </div>
     {% endif %}
 </header>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index a21b7c64..795db6fb 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -14,7 +14,8 @@
         <h2 class="title">{% trans "Your lists" %}</h2>
     </div>
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text="Create new list" focus="create-list-header" %}
+        {% trans "Create List" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text focus="create-list-header" %}
     </div>
 </header>
 
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index b6074a4a..f6fd7dab 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -45,13 +45,37 @@
                             {% include 'snippets/avatar.html' with user=notification.related_user %}
                             {% include 'snippets/username.html' with user=notification.related_user %}
                             {% if notification.notification_type == 'FAVORITE' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
+                                {% if related_status.status_type == 'Review' %}
+                                {% blocktrans with book_title=related_status.book.title related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Comment' %}
+                                {% blocktrans with book_title=related_status.book.title related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Quotation' %}
+                                {% blocktrans with book_title=related_status.book.title related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">status</a>{% endblocktrans %}
+                                {% endif %}
 
                             {% elif notification.notification_type == 'MENTION' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}mentioned you in a <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
+                                {% if related_status.status_type == 'Review' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}mentioned you in a <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Comment' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}mentioned you in a <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Quotation' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}mentioned you in a <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with related_path=related_status.local_path %}mentioned you in a <a href="{{ related_path }}">status</a>{% endblocktrans %}
+                                {% endif %}
 
                             {% elif notification.notification_type == 'REPLY' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">{{ preview_name }}</a>{% endblocktrans %}
+                                {% if related_status.status_type == 'Review' %}
+                                {% blocktrans with related_path=related_status.local_path parent_path=related_status.reply_parent.local_path book_title=related_status.reply_parent.book.title %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Comment' %}
+                                {% blocktrans with related_path=related_status.local_path parent_path=related_status.reply_parent.local_path book_title=related_status.reply_parent.book.title %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">comment on <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Quotation' %}
+                                {% blocktrans with related_path=related_status.local_path parent_path=related_status.reply_parent.local_path book_title=related_status.reply_parent.book.title %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">status</a>{% endblocktrans %}
+                                {% endif %}
 
                             {% elif notification.notification_type == 'FOLLOW' %}
                                 {% trans "followed you" %}
@@ -62,9 +86,21 @@
                                     {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
                                 </div>
                             {% elif notification.notification_type == 'BOOST' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
+                                {% if related_status.status_type == 'Review' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">review of <em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Comment' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">comment on<em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Quotation' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">quote from <em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">status</a>{% endblocktrans %}
+                                {% endif %}
                             {% elif notification.notification_type == 'ADD' %}
-                            {% if notification.related_list_item.approved %}{% trans "added" %}{% else %}{% trans "suggested adding" %}{% endif %} {% include 'snippets/book_titleby.html' with book=notification.related_list_item.book %} to your list "<a href="{{ notification.related_list_item.book_list.local_path }}{% if not notification.related_list_item.approved %}/curate{% endif %}">{{ notification.related_list_item.book_list.name }}</a>"
+                                {% if notification.related_list_item.approved %}
+                                {% blocktrans with book_path=notification.related_list_item.book.local_path book_title=notification.related_list_item.book.title list_path=notification.related_list_item.book_list.local_path list_name=notification.related_list_item.book_list.name %} added <em><a href="{{ book_path }}">{{ book_title }}</a></em> to your list "<a href="{{ list_path }}">{{ list_name }}</a>"{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with book_path=notification.related_list_item.book.local_path book_title=notification.related_list_item.book.title list_path=notification.related_list_item.book_list.local_path list_name=notification.related_list_item.book_list.name %} suggested adding <em><a href="{{ book_path }}">{{ book_title }}</a></em> to your list "<a href="{{ list_path }}/curate">{{ list_name }}</a>"{% endblocktrans %}
+                                {% endif %}
                             {% endif %}
                         {% elif notification.related_import %}
                             {% blocktrans with related_id=notification.related_import.id %} your <a href="/import/{{ related_id }}">import</a> completed.{% endblocktrans %}
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 66133bf5..8bbb7af2 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -32,7 +32,8 @@
             <p>
                 {% trans "Didn't find what you were looking for?" %}
             </p>
-            {% include 'snippets/toggle/open_button.html' with text="Show results from other catalogues" small=True controls_text="more-results" %}
+            {% trans "Show results from other catalogues" as button_text %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results" %}
         </div>
         {% endif %}
 
@@ -63,7 +64,8 @@
             {% endfor %}
 
             {% if local_results.results %}
-            {% include 'snippets/toggle/close_button.html' with text="Hide results from other catalogues" small=True controls_text="more-results" %}
+            {% trans "Hide results from other catalogues" as button_text %}
+            {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results" %}
             {% endif %}
         </div>
         {% endif %}
diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index b01ede4c..e561a8a3 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -1,5 +1,7 @@
-<a href="/book/{{ book.id }}">{{ book.title }}</a>
+{% load i18n %}
 {% if book.authors %}
-by {% include 'snippets/authors.html' with book=book %}
+{% blocktrans with path=book.local_path title=book.title %}<a href="{{ path }}">{{ title }}</a> by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %}
+{% else %}
+<a href="{{ book.local_path }}">{{ book.title }}</a>
 {% endif %}
 
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index 8f6671f7..187eae60 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -51,7 +51,8 @@
     <div class="columns pt-1">
         <div class="field has-addons column">
             <div class="control">
-                {% include 'snippets/toggle/toggle_button.html' with text="Include spoiler alert" icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=status.content_warning %}
+                {% trans "Include spoiler alert" as button_text %}
+                {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=status.content_warning %}
             </div>
             <div class="control">
             {% if type == 'direct' %}
diff --git a/bookwyrm/templates/snippets/delete_readthrough_modal.html b/bookwyrm/templates/snippets/delete_readthrough_modal.html
index 557059ed..e1560f93 100644
--- a/bookwyrm/templates/snippets/delete_readthrough_modal.html
+++ b/bookwyrm/templates/snippets/delete_readthrough_modal.html
@@ -14,6 +14,7 @@
     <button class="button is-danger" type="submit">
         {% trans "Delete" %}
     </button>
-    {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="delete-readthrough" controls_uid=readthrough.id %}
+    {% trans "Cancel" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete-readthrough" controls_uid=readthrough.id %}
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/generated_status/goal.html b/bookwyrm/templates/snippets/generated_status/goal.html
index 3b4d0de4..46572265 100644
--- a/bookwyrm/templates/snippets/generated_status/goal.html
+++ b/bookwyrm/templates/snippets/generated_status/goal.html
@@ -1 +1 @@
-{% load humanize %}set a goal to read {{ goal.goal | intcomma }} book{{ goal.goal | pluralize }} in {{ goal.year }}
+{% load i18n %}{% load humanize %}{% blocktrans count counter=goal.goal with counter=goal.goal year=goal.year %}set a goal to read {{ counter }} book in {{ year }}{% plural %}set a goal to read {{ counter }} books in {{ year }}{% endblocktrans %}
diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
index cf5d21f2..30ea1839 100644
--- a/bookwyrm/templates/snippets/goal_form.html
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -29,7 +29,8 @@
     <p>
         <button type="submit" class="button is-link">{% trans "Set goal" %}</button>
         {% if goal %}
-        {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="show-edit-goal" %}
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="show-edit-goal" %}
         {% endif %}
     </p>
 </form>
diff --git a/bookwyrm/templates/snippets/goal_progress.html b/bookwyrm/templates/snippets/goal_progress.html
index 2fa0da54..2d46181e 100644
--- a/bookwyrm/templates/snippets/goal_progress.html
+++ b/bookwyrm/templates/snippets/goal_progress.html
@@ -4,9 +4,13 @@
     {% if goal.progress_percent >= 100 %}
         {% trans "Success!" %}
     {% elif goal.progress_percent %}
-        {% blocktrans with percent=goal.percent %}{{ percent }}% complete!{% endblocktrans %}
+        {% blocktrans with percent=goal.progress_percent %}{{ percent }}% complete!{% endblocktrans %}
+    {% endif %}
+    {% if goal.user == request.user %}
+    {% blocktrans with read_count=goal.book_count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}You've read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
+    {% else %}
+    {% blocktrans with username=goal.user.display_name read_count=goal.book_count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}{{ username }} has read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
     {% endif %}
-    {% if goal.user == request.user %}You've{% else %}{{ goal.user.display_name }} has{% endif %} read {% if request.path != goal.local_path %}<a href="{{ goal.local_path }}">{% endif %}{{ goal.book_count }} of {{ goal.goal | intcomma }} books{% if request.path != goal.local_path %}</a>{% endif %}.
 </p>
 <progress class="progress is-large" value="{{ goal.book_count }}" max="{{ goal.goal }}" aria-hidden="true">{{ goal.progress_percent }}%</progress>
 
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index de85635e..edac21cf 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -11,7 +11,8 @@
                     <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
                         {% else %}{{ readthrough.progress }}%{% endif %}{% endif %}
                         {% if readthrough.progress %}
-                        {% include 'snippets/toggle/toggle_button.html' with text="Show all updates" controls_text="updates" controls_uid=readthrough.id class="is-small" %}
+                        {% trans "Show all updates" as button_text %}
+                        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="updates" controls_uid=readthrough.id class="is-small" %}
                         <ul id="updates-{{ readthrough.id }}" class="hidden">
                             {% for progress_update in readthrough.progress_updates %}
                             <li>
@@ -42,10 +43,12 @@
             <div class="column is-narrow">
                 <div class="field has-addons">
                     <div class="control">
-                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="Edit read dates" icon="pencil" controls_text="edit-readthrough" controls_uid=readthrough.id focus="edit-readthrough" %}
+                        {% trans "Edit read dates" as button_text %}
+                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text=button_text icon="pencil" controls_text="edit-readthrough" controls_uid=readthrough.id focus="edit-readthrough" %}
                     </div>
                     <div class="control">
-                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="Delete these read dates" icon="x" controls_text="delete-readthrough" controls_uid=readthrough.id focus="modal-title-delete-readthrough" %}
+                        {% trans "Delete these read dates" as button_text %}
+                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text=button_text icon="x" controls_text="delete-readthrough" controls_uid=readthrough.id focus="modal-title-delete-readthrough" %}
                     </div>
                 </div>
             </div>
@@ -59,7 +62,8 @@
         {% include 'snippets/readthrough_form.html' with readthrough=readthrough %}
         <div class="field is-grouped">
             <button class="button is-primary" type="submit">{% trans "Save" %}</button>
-            {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="edit-readthrough" controls_uid=readthrough.id %}
+            {% trans "Cancel" as button_text %}
+            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="edit-readthrough" controls_uid=readthrough.id %}
         </div>
     </form>
 </div>
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index 896c8016..ca65bf06 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -40,7 +40,8 @@
     </div>
     <div class="column">
         <button type="submit" class="button is-success">{% trans "Save" %}</button>
-        {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="finish-reading" controls_uid=uuid %}
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="finish-reading" controls_uid=uuid %}
     </div>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index a1ef2c32..d6fdb13b 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -5,13 +5,16 @@
 {% if dropdown %}<li role="menuitem">{% endif %}
     <div class="{% if dropdown %}dropdown-item pt-0 pb-0{% elif active_shelf.shelf.identifier|next_shelf != shelf.identifier %}hidden{% endif %}">
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text="Start reading" controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}
+        {% trans "Start reading" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}
     {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
     <button type="button" class="button {{ class }}" disabled><span>{% trans "Read" %}</span>
     {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text="Finish reading" controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current %}
+        {% trans "Finish reading" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current %}
     {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text="Want to read" controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current %}
+        {% trans "Want to read" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current %}
     {% endif %}{% elif shelf.editable %}
         <form name="shelve" action="/shelve/" method="post">
             {% csrf_token %}
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index cb3506e2..21341683 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -32,7 +32,8 @@
     </div>
     <div class="column">
         <button class="button is-success" type="submit">{% trans "Save" %}</button>
-        {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="start-reading" controls_uid=uuid %}
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="start-reading" controls_uid=uuid %}
     </div>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
index 179e004e..d7c37897 100644
--- a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
@@ -25,7 +25,8 @@
         <button class="button is-success" type="submit">
             <span>{% trans "Want to read" %}</span>
         </button>
-        {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="want-to-read" controls_uid=uuid %}
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="want-to-read" controls_uid=uuid %}
     </div>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index 1bf0d3c7..8d6c21ed 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -21,7 +21,8 @@
     {% if request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
-            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text="Reply" icon="comment" class="is-small toggle-button" focus="id_content_reply" %}
+            {% trans "Reply" as button_text %}
+            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon="comment" class="is-small toggle-button" focus="id_content_reply" %}
         </div>
         <div class="control">
             {% include 'snippets/boost_button.html' with status=status %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index b48566b0..bdbf3cfc 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -13,13 +13,15 @@
     {% if status.content_warning %}
     <div>
         <p>{{ status.content_warning }}</p>
-        {% include 'snippets/toggle/open_button.html' with text="show more" class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+        {% trans "Show more" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
     </div>
     {% endif %}
 
     <div{% if status.content_warning %} class="hidden" id="show-status-cw-{{ status.id }}"{% endif %}>
         {% if status.content_warning %}
-        {% include 'snippets/toggle/close_button.html' with text="show less" class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+        {% trans "Show less" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
         {% endif %}
 
         {% if status.quote %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index b349a4fc..339ef11f 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -1,4 +1,6 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
+
 {% with 0|uuid as uuid %}
 {% if full %}
 {% with full|to_markdown|safe as full %}
@@ -7,12 +9,14 @@
 {% if trimmed != full %}
 <div id="hide-full-{{ uuid }}">
     <div class="content" id="trimmed-{{ uuid }}"><span dir="auto">{{ trimmed }}</span>
-        {% include 'snippets/toggle/open_button.html' with text="show more" controls_text="full" controls_uid=uuid class="is-small" %}
+        {% trans "Show more" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
     </div>
 </div>
 <div id="full-{{ uuid }}" class="hidden">
     <div class="content"><span dir="auto">{{ full }}</span>
-        {% include 'snippets/toggle/close_button.html' with text="show less" controls_text="full" controls_uid=uuid class="is-small" %}
+        {% trans "Show less" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
     </div>
 </div>
 {% else %}
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 9e847a5d..8e47041f 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -14,7 +14,8 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text="Create new list" %}
+        {% trans "Create new list" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index acd10e73..c7c83388 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -2,8 +2,6 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
 
-{% block title %}{% blocktrans with username=user.display_name %}Shelves: {{ username }}{% endblocktrans %}{% endblock %}
-
 {% block header %}
 <header class="columns">
     <h1 class="title">
@@ -32,7 +30,7 @@
 
     {% if is_self %}
     <div class="column is-narrow">
-        {% trans "Create Shelf" as button_text %}
+        {% trans "Create shelf" as button_text %}
         {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
     </div>
     {% endif %}
@@ -53,7 +51,8 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Edit shelf" icon="pencil" controls_text="edit-shelf-form" focus="edit-shelf-form-header" %}
+        {% trans "Edit shelf" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-shelf-form" focus="edit-shelf-form-header" %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html
index 3158ff54..c641c58f 100644
--- a/bookwyrm/templates/user/user_preview.html
+++ b/bookwyrm/templates/user/user_preview.html
@@ -12,8 +12,8 @@
         <p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
         <p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
         <p>
-            <a href="{{ user.local_path }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
-            <a href="{{ user.local_path }}/following">{{ user.following.count }} following</a>
+        <a href="{{ user.local_path }}/followers">{% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}</a>,
+        <a href="{{ user.local_path }}/following">{% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %}</a>
         </p>
     </div>
 </div>
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index bcaa30df..85175813 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# English language text for the bookwyrm UI
+# Stub English-language trnaslation file
 # Copyright (C) 2021 Mouse Reeve
-# This file is distributed under the same license as the bookwyrm package.
+# This file is distributed under the same license as the BookWyrm package.
 # Mouse Reeve <mousereeve@riseup.net>, 2021
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.1.1\n"
+"Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 10:45-0800\n"
-"PO-Revision-Date: 2021-02-27 13:50+PST\n"
+"POT-Creation-Date: 2021-03-01 09:32-0800\n"
+"PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
-"Language-Team: Mouse Reeve <LL@li.org>\n"
-"Language: English \n"
+"Language-Team: English <LL@li.org>\n"
+"Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,61 +61,85 @@ msgstr ""
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:104 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:98
+msgid "Add Description"
+msgstr ""
+
+#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:108 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:64
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book.html:140
+#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr ""
+
+#: bookwyrm/templates/book.html:142
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book.html:146
+#: bookwyrm/templates/book.html:144
+msgid "Add read dates"
+msgstr ""
+
+#: bookwyrm/templates/book.html:149
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book.html:153
+#: bookwyrm/templates/book.html:156
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book.html:174
+#: bookwyrm/templates/book.html:178
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:178 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book.html:195
+#: bookwyrm/templates/book.html:199
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book.html:206
+#: bookwyrm/templates/book.html:210
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:217 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:88
+#: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book.html:246
+#: bookwyrm/templates/book.html:250
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/feed/feed_layout.html:51
+msgid "Close"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -219,10 +243,6 @@ msgstr ""
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
-msgid "Cancel"
-msgstr ""
-
 #: bookwyrm/templates/edit_book.html:31
 msgid "Title:"
 msgstr ""
@@ -304,6 +324,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
+#: bookwyrm/templates/layout.html:79
 msgid "Direct Messages"
 msgstr ""
 
@@ -354,7 +375,7 @@ msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:70 bookwyrm/templates/goal.html:25
+#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -369,7 +390,11 @@ msgstr ""
 msgid "%(year)s Reading Progress"
 msgstr ""
 
-#: bookwyrm/templates/goal.html:29
+#: bookwyrm/templates/goal.html:11
+msgid "Edit Goal"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
 msgid ""
@@ -377,22 +402,23 @@ msgid ""
 "your progress throughout the year."
 msgstr ""
 
-#: bookwyrm/templates/goal.html:38
+#: bookwyrm/templates/goal.html:39
 #, python-format
 msgid "%(name)s hasn't set a reading goal for %(year)s."
 msgstr ""
 
-#: bookwyrm/templates/goal.html:50
+#: bookwyrm/templates/goal.html:51
 #, python-format
 msgid "Your %(year)s Books"
 msgstr ""
 
-#: bookwyrm/templates/goal.html:52
+#: bookwyrm/templates/goal.html:53
 #, python-format
 msgid "%(username)s's %(year)s Books"
 msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
+#: bookwyrm/templates/layout.html:94
 msgid "Import Books"
 msgstr ""
 
@@ -494,6 +520,10 @@ msgstr ""
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
+#: bookwyrm/templates/layout.html:33
+msgid "Search for a book or user"
+msgstr ""
+
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:62
 msgid "Search"
@@ -511,6 +541,29 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
+#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:89
+msgid "Settings"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:110
+msgid "Site Configuration"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:117
+msgid "Log out"
+msgstr ""
+
 #: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
@@ -536,7 +589,14 @@ msgstr ""
 msgid "Contact site admin"
 msgstr ""
 
+#: bookwyrm/templates/layout.html:198
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
+#: bookwyrm/templates/lists/lists.html:17
 msgid "Create List"
 msgstr ""
 
@@ -565,6 +625,7 @@ msgid "Discard"
 msgstr ""
 
 #: bookwyrm/templates/lists/edit_form.html:5
+#: bookwyrm/templates/lists/list_layout.html:17
 msgid "Edit List"
 msgstr ""
 
@@ -655,7 +716,7 @@ msgstr ""
 msgid "Your lists"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:39
+#: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
 msgstr ""
 
@@ -692,50 +753,140 @@ msgstr ""
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:48
+#: bookwyrm/templates/notifications.html:49
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:54
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
-"%(preview_name)s</a>"
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:57
-msgid "followed you"
+#: bookwyrm/templates/notifications.html:55
+#, python-format
+msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:60
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:62
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:64
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:66
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:71
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:73
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:75
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:77
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:81
+msgid "followed you"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:84
 msgid "sent you a follow request"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:65
+#: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
+"a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:67
-msgid "added"
+#: bookwyrm/templates/notifications.html:92
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
+"a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:67
-msgid "suggested adding"
+#: bookwyrm/templates/notifications.html:94
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
+"em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:70
+#: bookwyrm/templates/notifications.html:96
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:100
+#, python-format
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:102
+#, python-format
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:138
 msgid "You're all caught up!"
 msgstr ""
 
@@ -815,10 +966,6 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr ""
-
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
 msgstr ""
@@ -845,20 +992,28 @@ msgstr ""
 msgid "Didn't find what you were looking for?"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:56
+#: bookwyrm/templates/search_results.html:35
+msgid "Show results from other catalogues"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:57
 msgid "Import book"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:73
-msgid "Matching Users"
+#: bookwyrm/templates/search_results.html:67
+msgid "Hide results from other catalogues"
 msgstr ""
 
 #: bookwyrm/templates/search_results.html:75
+msgid "Matching Users"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:77
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/search_results.html:92
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
@@ -871,11 +1026,6 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:19
-#: bookwyrm/templates/settings/manage_invites.html:3
-msgid "Invites"
-msgstr ""
-
 #: bookwyrm/templates/settings/admin_layout.html:23
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
@@ -1019,10 +1169,15 @@ msgstr ""
 msgid "Un-block"
 msgstr ""
 
+#: bookwyrm/templates/snippets/book_titleby.html:3
+#, python-format
+msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgstr ""
+
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:40
 #: bookwyrm/templates/snippets/status/status_body.html:41
+#: bookwyrm/templates/snippets/status/status_body.html:42
 msgid "Boost status"
 msgstr ""
 
@@ -1039,16 +1194,16 @@ msgstr ""
 msgid "Spoilers ahead!"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:8
+#: bookwyrm/templates/snippets/create_status.html:9
 msgid "Review"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:11
+#: bookwyrm/templates/snippets/create_status.html:12
 #: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:14
+#: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
 msgstr ""
 
@@ -1063,14 +1218,18 @@ msgstr ""
 msgid "No rating"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:59
+#: bookwyrm/templates/snippets/create_status_form.html:54
+msgid "Include spoiler alert"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:60
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:66
+#: bookwyrm/templates/snippets/create_status_form.html:67
 msgid "Post"
 msgstr ""
 
@@ -1092,8 +1251,8 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:44
 #: bookwyrm/templates/snippets/status/status_body.html:45
+#: bookwyrm/templates/snippets/status/status_body.html:46
 msgid "Like status"
 msgstr ""
 
@@ -1122,6 +1281,13 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
+#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#, python-format
+msgid "set a goal to read %(counter)s book in %(year)s"
+msgid_plural "set a goal to read %(counter)s books in %(year)s"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"
 msgstr ""
@@ -1165,6 +1331,19 @@ msgstr ""
 msgid "%(percent)s%% complete!"
 msgstr ""
 
+#: bookwyrm/templates/snippets/goal_progress.html:10
+#, python-format
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:12
+#, python-format
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
 msgstr ""
@@ -1233,18 +1412,27 @@ msgstr ""
 msgid "finished"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:29
+#: bookwyrm/templates/snippets/readthrough.html:14
+msgid "Show all updates"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:30
 msgid "Delete this progress update"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:39
+#: bookwyrm/templates/snippets/readthrough.html:40
 msgid "started"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:57
+#: bookwyrm/templates/snippets/readthrough.html:46
+#: bookwyrm/templates/snippets/readthrough.html:60
 msgid "Edit read dates"
 msgstr ""
 
+#: bookwyrm/templates/snippets/readthrough.html:50
+msgid "Delete these read dates"
+msgstr ""
+
 #: bookwyrm/templates/snippets/readthrough_form.html:7
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
@@ -1338,10 +1526,23 @@ msgstr ""
 msgid "More shelves"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+msgid "Start reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 msgid "Read"
 msgstr ""
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+msgid "Finish reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr ""
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -1352,20 +1553,27 @@ msgstr ""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
-msgid "Want to read"
-msgstr ""
-
 #: bookwyrm/templates/snippets/status/status.html:7
 msgid "boosted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_body.html:36
+#: bookwyrm/templates/snippets/status/status_body.html:24
 #: bookwyrm/templates/snippets/status/status_body.html:37
+#: bookwyrm/templates/snippets/status/status_body.html:38
 msgid "Reply"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_content.html:42
+#: bookwyrm/templates/snippets/status/status_content.html:16
+#: bookwyrm/templates/snippets/trimmed_text.html:12
+msgid "Show more"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:23
+#: bookwyrm/templates/snippets/trimmed_text.html:18
+msgid "Show less"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:44
 msgid "Open image in new window"
 msgstr ""
 
@@ -1401,6 +1609,7 @@ msgid "Create New Shelf"
 msgstr ""
 
 #: bookwyrm/templates/user/create_shelf_form.html:22
+#: bookwyrm/templates/user/shelf.html:33
 msgid "Create shelf"
 msgstr ""
 
@@ -1440,26 +1649,25 @@ msgstr ""
 msgid "Lists: %(username)s"
 msgstr ""
 
-#: bookwyrm/templates/user/lists.html:28
+#: bookwyrm/templates/user/lists.html:17
+msgid "Create new list"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:5
-#, python-format
-msgid "Shelves: %(username)s"
-msgstr ""
-
-#: bookwyrm/templates/user/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:9
 msgid "Your Shelves"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:13
+#: bookwyrm/templates/user/shelf.html:11
 #, python-format
 msgid "%(username)s: Shelves"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:35
-msgid "Create Shelf"
+#: bookwyrm/templates/user/shelf.html:54
+msgid "Edit shelf"
 msgstr ""
 
 #: bookwyrm/templates/user/user.html:15
@@ -1514,3 +1722,15 @@ msgstr ""
 #, python-format
 msgid "Joined %(date)s"
 msgstr ""
+
+#: bookwyrm/templates/user/user_preview.html:15
+#, python-format
+msgid "%(counter)s follower"
+msgid_plural "%(counter)s followers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/user_preview.html:16
+#, python-format
+msgid "%(counter)s following"
+msgstr ""