Merge branch 'main' into create-book

bookwyrm/forms.py

@@ -6,6 +6,7 @@ from django import forms
 from django.forms import ModelForm, PasswordInput, widgets
 from django.forms.widgets import Textarea
 from django.utils import timezone
+from django.utils.translation import gettext as _
 
 from bookwyrm import models
 
@@ -181,13 +182,14 @@ class CreateInviteForm(CustomForm):
         exclude = ['code', 'user', 'times_used']
         widgets = {
             'expiry': ExpiryWidget(choices=[
-                ('day', 'One Day'),
+                ('day', _('One Day')),
-                ('week', 'One Week'),
+                ('week', _('One Week')),
-                ('month', 'One Month'),
+                ('month', _('One Month')),
-                ('forever', 'Does Not Expire')]),
+                ('forever', _('Does Not Expire'))]),
             'use_limit': widgets.Select(
-                choices=[(i, "%d uses" % (i,)) for i in [1, 5, 10, 25, 50, 100]]
+                choices=[(i, _("%(count)d uses" % {'count': i})) \
-                + [(None, 'Unlimited')])
+                        for i in [1, 5, 10, 25, 50, 100]]
+                + [(None, _('Unlimited'))])
         }
 
 class ShelfForm(CustomForm):

bookwyrm/settings.py

@@ -140,7 +140,9 @@ AUTH_PASSWORD_VALIDATORS = [
 LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
+    ('de-de', _('German')),
     ('fr-fr', _('French')),
+    ('zh-cn', _('Simplified Chinese')),
 ]
 
 

bookwyrm/templates/book.html

@@ -18,7 +18,7 @@
             </h1>
             {% if book.authors %}
             <h2 class="subtitle">
-                by {% include 'snippets/authors.html' with book=book %}
+                {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
             </h2>
             {% endif %}
         </div>
@@ -78,8 +78,13 @@
                 </dl>
 
                 <p>
-                {% if book.physical_format %}{{ book.physical_format | title }}{% if book.pages %},<br>{% endif %}{% endif %}
+                {% if book.physical_format and not book.pages %}
-                {% if book.pages %}{{ book.pages }} pages{% endif %}
+                {{ book.physical_format | title }}
+                {% elif book.physical_format and book.pages %}
+                {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
+                {% elif book.pages %}
+                {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
+                {% endif %}
                 </p>
 
                 {% if book.openlibrary_key %}
@@ -90,7 +95,10 @@
 
         <div class="column">
             <div class="block">
-                <h3 class="field is-grouped">{% include 'snippets/stars.html' with rating=rating %} ({{ review_count }} review{{ review_count|pluralize }})</h3>
+                <h3 class="field is-grouped">
+                    {% include 'snippets/stars.html' with rating=rating %}
+                    {% blocktrans count counter=review_count %}({{ review_count }} review){% plural %}({{ review_count }} reviews){% endblocktrans %}
+                </h3>
 
                 {% include 'snippets/trimmed_text.html' with full=book|book_description %}
 
@@ -116,7 +124,7 @@
 
 
                 {% if book.parent_work.editions.count > 1 %}
-                <p><a href="/book/{{ book.parent_work.id }}/editions">{{ book.parent_work.editions.count }} editions</a></p>
+                <p>{% blocktrans with path=book.parent_work.local_path count=book.parent_work.editions.count %}<a href="{{ path }}/editions">{{ count }} editions</a>{% endblocktrans %}</p>
                 {% endif %}
             </div>
 
@@ -124,13 +132,13 @@
             <div class="block">
                 {% for shelf in user_shelves %}
                 <p>
-                    This edition is on your <a href="/user/{{ user.localname }}/shelf/{{ shelf.shelf.identifier }}">{{ shelf.shelf.name }}</a> shelf.
+                    {% blocktrans with path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}This edition is on your <a href="{{ path }}">{{ shelf_name }}</a> shelf.{% endblocktrans %}
                     {% include 'snippets/shelf_selector.html' with current=shelf.shelf %}
                 </p>
                 {% endfor %}
                 {% for shelf in other_edition_shelves %}
                 <p>
-                    A <a href="/book/{{ shelf.book.id }}">different edition</a> of this book is on your <a href="/user/{{ user.localname }}/shelf/{{ shelf.shelf.identifier }}">{{ shelf.shelf.name }}</a> shelf.
+                {% blocktrans with book_path=shelf.book.local_path shelf_path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}A <a href="{{ book_path }}">different edition</a> of this book is on your <a href="{{ shelf_path }}">{{ shelf_name }}</a> shelf.{% endblocktrans %}
                     {% include 'snippets/switch_edition_button.html' with edition=book %}
                 </p>
                 {% endfor %}

bookwyrm/templates/feed/feed.html

@@ -3,7 +3,7 @@
 {% load bookwyrm_tags %}
 {% block panel %}
 
-<h1 class="title">{% blocktrans with tab_title=tab|title %}{{ tab_title }} Timeline{% endblocktrans %}</h1>
+<h1 class="title">{% blocktrans %}{{ tab_title }} Timeline{% endblocktrans %}</h1>
 <div class="tabs">
     <ul>
         <li class="{% if tab == 'home' %}is-active{% endif %}">

bookwyrm/templates/feed/feed_layout.html

@@ -20,7 +20,10 @@
                 {% with shelf_counter=forloop.counter %}
                     <li>
                         <p>
-                            {{ shelf.name }}
+                            {% if shelf.identifier == 'to-read' %}{% trans "To Read" %}
+                            {% elif shelf.identifier == 'reading' %}{% trans "Currently Reading" %}
+                            {% elif shelf.identifier == 'read' %}{% trans "Read" %}
+                            {% else %}{{ shelf.name }}{% endif %}
                         </p>
                         <div class="tabs is-small is-toggle">
                             <ul>

bookwyrm/templates/lists/list.html

@@ -32,7 +32,7 @@
                     </div>
                     <div class="card-footer has-background-white-bis">
                         <div class="card-footer-item">
-                            <p>{% trans "Added by" %} {% include 'snippets/username.html' with user=item.user %}</p>
+                            <p>{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
                         </div>
                         {% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
                         <form name="add-book" method="post" action="{% url 'list-remove-book' list.id %}" class="card-footer-item">

bookwyrm/templates/lists/lists.html

@@ -29,7 +29,7 @@
     {% endif %}
 
     {% if request.user.list_set.count > 4 %}
-    <a href="{% url 'user-lists' request.user.localname %}">See all {{ request.user.list_set.count}} lists</a>
+    <a href="{% url 'user-lists' request.user.localname %}">{% blocktrans with size=request.user.list_set.count %}See all {{ size }} lists{% endblocktrans %}</a>
     {% endif %}
 </section>
 {% endif %}

bookwyrm/templates/snippets/status/status.html

@@ -1,7 +1,7 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
 {% if not status.deleted %}
-    {% if status.status_type == 'Boost' %}
+    {% if status.status_type == 'Announce' %}
         {% include 'snippets/avatar.html' with user=status.user %}
         {% include 'snippets/username.html' with user=status.user %}
         {% trans "boosted" %}

bookwyrm/templates/snippets/status/status_content.html

@@ -32,7 +32,7 @@
         </div>
         {% endif %}
 
-        {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Boost' %}
+        {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
         {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
         {% endif %}
         {% if status.attachments %}

bookwyrm/templates/snippets/status/status_options.html

@@ -14,7 +14,7 @@
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
         <button class="button is-danger is-light is-fullwidth is-small" type="submit">
-            {% trans "Delete post" %}
+            {% trans "Delete status" %}
         </button>
     </form>
 </li>

bookwyrm/templates/user/create_shelf_form.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block header %}
-{% trans "Create New Shelf" %}
+{% trans "Create Shelf" %}
 {% endblock %}
 
 {% block form %}
@@ -19,7 +19,7 @@
             {% include 'snippets/privacy_select.html' %}
         </div>
         <div class="control">
-            <button class="button is-primary" type="submit">{% trans "Create shelf" %}</button>
+            <button class="button is-primary" type="submit">{% trans "Create Shelf" %}</button>
         </div>
     </div>
 </form>

bookwyrm/templates/user/edit_shelf_form.html

@@ -29,4 +29,3 @@
 </form>
 {% endblock %}
 
-

bookwyrm/templates/user/lists.html

@@ -14,7 +14,7 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        {% trans "Create new list" as button_text %}
+        {% trans "Create list" as button_text %}
         {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text %}
     </div>
     {% endif %}

bookwyrm/templates/user/shelf.html

@@ -21,7 +21,7 @@
             <ul>
             {% for shelf_tab in shelves %}
             <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
-                    <a href="/user/{{ user | username }}/shelf/{{ shelf_tab.identifier }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{{ shelf_tab.name }}</a>
+                <a href="/user/{{ user | username }}/shelf/{{ shelf_tab.identifier }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{% if shelf_tab.identifier == 'to-read' %}{% trans "To Read" %}{% elif shelf_tab.identifier == 'reading' %}{% trans "Currently Reading" %}{% elif shelf_tab.identifier == 'read' %}{% trans "Read" %}{% else %}{{ shelf_tab.name }}{% endif %}</a>
                 </li>
             {% endfor %}
             </ul>

bookwyrm/views/feed.py

@@ -6,6 +6,7 @@ from django.http import HttpResponseNotFound
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
+from django.utils.translation import gettext as _
 from django.views import View
 
 from bookwyrm import forms, models
@@ -29,18 +30,22 @@ class Feed(View):
         if tab == 'home':
             activities = get_activity_feed(
                 request.user, following_only=True)
+            tab_title = _('Home')
         elif tab == 'local':
             activities = get_activity_feed(
                 request.user, privacy=['public', 'followers'], local_only=True)
+            tab_title = _('Local')
         else:
             activities = get_activity_feed(
                 request.user, privacy=['public', 'followers'])
+            tab_title = _('Federated')
         paginated = Paginator(activities, PAGE_LENGTH)
 
         data = {**feed_page_data(request.user), **{
             'user': request.user,
             'activities': paginated.page(page),
             'tab': tab,
+            'tab_title': tab_title,
             'goal_form': forms.GoalForm(),
             'path': '/%s' % tab,
         }}
@@ -161,6 +166,7 @@ def get_suggested_books(user, max_books=5):
             continue
         shelf_preview = {
             'name': shelf.name,
+            'identifier': shelf.identifier,
             'books': [s.book for s in shelf_books]
         }
         suggested_books.append(shelf_preview)

bw-dev

@@ -91,7 +91,7 @@ case "$CMD" in
         execweb python manage.py collectstatic --no-input
         ;;
     makemessages)
-        execweb django-admin makemessages --extension html --ignore=venv3 $@
+        execweb django-admin makemessages --no-wrap --ignore=venv3 $@
         ;;
     compilemessages)
         execweb django-admin compilemessages --ignore venv3 $@

locale/en_US/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-01 09:32-0800\n"
+"POT-Creation-Date: 2021-03-02 21:36+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -18,6 +18,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+msgid "Unlimited"
+msgstr ""
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+msgid "username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "German"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:145
+msgid "Simplified Chinese"
+msgstr ""
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
@@ -32,6 +91,10 @@ msgstr ""
 msgid "Books by %(name)s"
 msgstr ""
 
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
@@ -57,20 +120,37 @@ msgstr ""
 msgid "ASIN:"
 msgstr ""
 
+#: bookwyrm/templates/book.html:84
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr ""
+
 #: bookwyrm/templates/book.html:86
+#, python-format
+msgid "%(pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/book.html:91
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/book.html:106
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 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
@@ -81,7 +161,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
 #: 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
@@ -92,51 +172,66 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:127
+#, python-format
+msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
+msgstr ""
+
+#: bookwyrm/templates/book.html:135
+#, python-format
+msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+
+#: bookwyrm/templates/book.html:141
+#, python-format
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+
+#: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:152
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:157
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:164
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:186
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:207
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:218
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:258
 msgid "rated it"
 msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
 msgstr ""
 
@@ -341,15 +436,15 @@ msgstr ""
 msgid "%(tab_title)s Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
 msgid "Local"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
 msgid "Federated"
 msgstr ""
 
@@ -358,8 +453,7 @@ msgid "Announcements"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:32
-msgid ""
+msgid "There aren't any activities right now! Try following a user to get started"
-"There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:5
@@ -371,11 +465,26 @@ msgid "Your books"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
+msgid "There are no books here right now! Try searching for a book to get started"
-"There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+msgid "To Read"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Currently Reading"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -397,9 +506,7 @@ msgstr ""
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
 msgstr ""
 
 #: bookwyrm/templates/goal.html:39
@@ -590,9 +697,7 @@ msgid "Contact site admin"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:198
-msgid ""
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-"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
@@ -662,7 +767,8 @@ msgid "This list is currently empty"
 msgstr ""
 
 #: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
+#, python-format
+msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/lists/list.html:41
@@ -716,6 +822,11 @@ msgstr ""
 msgid "Your lists"
 msgstr ""
 
+#: bookwyrm/templates/lists/lists.html:32
+#, python-format
+msgid "See all %(size)s lists"
+msgstr ""
+
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
 msgstr ""
@@ -755,23 +866,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:49
 #, python-format
-msgid ""
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
-msgid ""
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:55
@@ -781,23 +886,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:60
 #, python-format
-msgid ""
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-"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 ""
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-"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 ""
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:66
@@ -807,30 +906,22 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:71
 #, python-format
-msgid ""
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-"<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 ""
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-"<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 ""
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-"<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 ""
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:81
@@ -843,23 +934,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid ""
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
-"a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid ""
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
-"a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
-"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:96
@@ -869,16 +954,12 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
-msgid ""
+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>\""
-" 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 ""
+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>\""
-" 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
@@ -1239,9 +1320,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
 msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1294,9 +1373,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
-msgid ""
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:9
@@ -1333,15 +1410,12 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-"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 ""
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
 msgstr ""
 
 #: bookwyrm/templates/snippets/pagination.html:7
@@ -1530,10 +1604,6 @@ msgstr ""
 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 ""
@@ -1583,7 +1653,7 @@ msgid "More options"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+msgid "Delete status"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
@@ -1605,12 +1675,8 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr ""
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr ""
-
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
+msgid "Create Shelf"
-msgid "Create shelf"
 msgstr ""
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1649,11 +1715,7 @@ msgstr ""
 msgid "Lists: %(username)s"
 msgstr ""
 
-#: bookwyrm/templates/user/lists.html:17
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
-msgid "Create new list"
-msgstr ""
-
-#: bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr ""
 
@@ -1666,6 +1728,10 @@ msgstr ""
 msgid "%(username)s: Shelves"
 msgstr ""
 
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr ""
+
 #: bookwyrm/templates/user/shelf.html:54
 msgid "Edit shelf"
 msgstr ""