diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 739c0599a..515bb1610 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -49,7 +49,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     def get_remote_id(self):
         """ shelf identifier instead of id """
         base_path = self.user.remote_id
-        return "%s/shelf/%s" % (base_path, self.identifier)
+        return "%s/books/%s" % (base_path, self.identifier)
 
     class Meta:
         """ user/shelf unqiueness """
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index f0f04b846..0937fcc30 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -55,7 +55,7 @@
         <div class="navbar-start">
             {% if request.user.is_authenticated %}
             <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
-                {% trans "Your shelves" %}
+                {% trans "Your books" %}
             </a>
             <a href="/#feed" class="navbar-item">
                 {% trans "Feed" %}
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 47ea73a0f..1bc448ec2 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -1,7 +1,7 @@
 {% extends 'components/dropdown.html' %}
 {% load i18n %}
 {% block dropdown-trigger %}
-<span>{% trans "Change shelf" %}</span>
+<span>{% trans "Move book" %}</span>
 <span class="icon icon-arrow-down" aria-hidden="true"></span>
 {% endblock %}
 
@@ -25,7 +25,7 @@
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ current.id }}">
-        <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Unshelve" %}</button>
+        <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Remove" %}</button>
     </form>
 </li>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index a002917f4..058bfc121 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -45,7 +45,7 @@
             {% csrf_token %}
             <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
             <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
-            <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Unshelve" %}</button>
+            <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}</button>
         </form>
     </div>
 </li>
diff --git a/bookwyrm/templates/user/books_header.html b/bookwyrm/templates/user/books_header.html
new file mode 100644
index 000000000..8fea84c7a
--- /dev/null
+++ b/bookwyrm/templates/user/books_header.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% if is_self %}
+{% trans "Your books" %}
+{% else %}
+{% blocktrans with username=user.display_name %}{{ username }}'s books{% endblocktrans %}
+{% endif %}
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 4c60258c9..5173da076 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -3,14 +3,14 @@
 {% load humanize %}
 {% load i18n %}
 
+{% block title %}
+{% include 'user/books_header.html' %}
+{% endblock %}
+
 {% block header %}
 <header class="columns">
     <h1 class="title">
-        {% if is_self %}
-        {% trans "Your Shelves" %}
-        {% else %}
-        {% blocktrans with username=user.display_name %}{{ username }}: Shelves{% endblocktrans %}
-        {% endif %}
+        {% include 'user/books_header.html' %}
     </h1>
 </header>
 {% endblock %}
@@ -22,7 +22,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 %}>{% 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>
+                <a href="{{ shelf_tab.local_path }}"{% 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>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 52a915610..a54664cef 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,5 +1,6 @@
 {% extends 'user/user_layout.html' %}
 {% load i18n %}
+{% load bookwyrm_tags %}
 
 {% block title %}{{ user.display_name }}{% endblock %}
 
@@ -23,12 +24,14 @@
 {% block panel %}
 {% if user.bookwyrm_user %}
 <div class="block">
-    <h2 class="title">{% trans "Shelves" %}</h2>
+    <h2 class="title">
+        {% include 'user/books_header.html' %}
+    </h2>
     <div class="columns">
         {% for shelf in shelves %}
         <div class="column is-narrow">
             <h3>{{ shelf.name }}
-                {% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">{% blocktrans with size=shelf.size %}See all {{ size }}{% endblocktrans %}</a>)</small>{% endif %}</h3>
+                {% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">{% blocktrans with size=shelf.size %}View all {{ size }}{% endblocktrans %}</a>)</small>{% endif %}</h3>
             <div class="is-mobile field is-grouped">
             {% for book in shelf.books %}
             <div class="control">
@@ -41,7 +44,7 @@
         </div>
         {% endfor %}
     </div>
-    <small><a href="{{ user.local_path }}/shelves">{% blocktrans %}See all {{ shelf_count }} shelves{% endblocktrans %}</a></small>
+    <small><a href="{% url 'user-shelves' user|username %}">{% trans "View all books" %}</a></small>
 </div>
 {% endif %}
 
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index d60db2a00..0c3e94e3c 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -42,7 +42,7 @@
     {% endif %}
 </div>
 {% with user|username as username %}
-{% if 'user/'|add:username|add:'/shelf' not in request.path  and 'user/'|add:username|add:'/shelves' not in request.path %}
+{% if 'user/'|add:username|add:'/books' not in request.path and 'user/'|add:username|add:'/shelf' not in request.path %}
 <nav class="tabs">
     <ul>
         {% url 'user-feed' user|username as url %}
@@ -65,7 +65,7 @@
         {% if user.shelf_set.exists %}
         {% url 'user-shelves' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Shelves" %}</a>
+            <a href="{{ url }}">{% trans "Books" %}</a>
         </li>
         {% endif %}
     </ul>
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index 3bbb9890d..ebda04999 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -27,7 +27,7 @@ class Shelf(TestCase):
         shelf = models.Shelf.objects.create(
             name="Test Shelf", identifier="test-shelf", user=self.local_user
         )
-        expected_id = "https://%s/user/mouse/shelf/test-shelf" % settings.DOMAIN
+        expected_id = "https://%s/user/mouse/books/test-shelf" % settings.DOMAIN
         self.assertEqual(shelf.get_remote_id(), expected_id)
         models.Shelf.broadcast = real_broadcast
 
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 33c4aaad7..cd7a4e41b 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -138,16 +138,8 @@ urlpatterns = [
         views.Following.as_view(),
         name="user-following",
     ),
-    re_path(r"%s/shelves/?$" % user_path, views.user_shelves_page, name="user-shelves"),
-    re_path(r"%s/lists/?$" % user_path, views.UserLists.as_view(), name="user-lists"),
-    # goals
-    re_path(
-        r"%s/goal/(?P<year>\d{4})/?$" % user_path,
-        views.Goal.as_view(),
-        name="user-goal",
-    ),
-    re_path(r"^hide-goal/?$", views.hide_goal, name="hide-goal"),
     # lists
+    re_path(r"%s/lists/?$" % user_path, views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
     re_path(r"^list/add-book/?$", views.list.add_book, name="list-add-book"),
@@ -159,6 +151,29 @@ urlpatterns = [
     re_path(
         r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
     ),
+    # shelf
+    re_path(r"%s/books/?$" % user_path, views.user_shelves_page, name="user-shelves"),
+    re_path(
+        r"^%s/(helf|books)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
+        views.Shelf.as_view(),
+        name="shelf",
+    ),
+    re_path(
+        r"^%s/(books|shelf)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % local_user_path,
+        views.Shelf.as_view(),
+        name="shelf",
+    ),
+    re_path(r"^create-shelf/?$", views.create_shelf, name="shelf-create"),
+    re_path(r"^delete-shelf/(?P<shelf_id>\d+)?$", views.delete_shelf),
+    re_path(r"^shelve/?$", views.shelve),
+    re_path(r"^unshelve/?$", views.unshelve),
+    # goals
+    re_path(
+        r"%s/goal/(?P<year>\d{4})/?$" % user_path,
+        views.Goal.as_view(),
+        name="user-goal",
+    ),
+    re_path(r"^hide-goal/?$", views.hide_goal, name="hide-goal"),
     # preferences
     re_path(r"^preferences/profile/?$", views.EditUser.as_view(), name="prefs-profile"),
     re_path(r"^preferences/password/?$", views.ChangePassword.as_view()),
@@ -199,20 +214,6 @@ urlpatterns = [
     re_path(r"^tag/(?P<tag_id>.+)/?$", views.Tag.as_view()),
     re_path(r"^tag/?$", views.AddTag.as_view()),
     re_path(r"^untag/?$", views.RemoveTag.as_view()),
-    # shelf
-    re_path(
-        r"^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
-        views.Shelf.as_view(),
-        name="shelf",
-    ),
-    re_path(
-        r"^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % local_user_path,
-        views.Shelf.as_view(),
-    ),
-    re_path(r"^create-shelf/?$", views.create_shelf, name="shelf-create"),
-    re_path(r"^delete-shelf/(?P<shelf_id>\d+)?$", views.delete_shelf),
-    re_path(r"^shelve/?$", views.shelve),
-    re_path(r"^unshelve/?$", views.unshelve),
     # reading progress
     re_path(r"^edit-readthrough/?$", views.edit_readthrough, name="edit-readthrough"),
     re_path(r"^delete-readthrough/?$", views.delete_readthrough),
diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index cee809a37..dca726855 100644
Binary files a/locale/de_DE/LC_MESSAGES/django.mo and b/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 6d98fa0b2..ac095694d 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/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-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -51,44 +51,64 @@ msgstr "%(count)d Benutzungen"
 msgid "Unlimited"
 msgstr "Ungelistet"
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s ist keine gültige remote_id"
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "Username"
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr "Nicht gefunden"
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr "Ups!"
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr ""
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "Etwas lief schief. Entschuldigung!"
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr "Autor*in editieren"
@@ -112,92 +132,66 @@ msgstr "von"
 msgid "Edit Book"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:79
-#, python-format
-msgid "%(format)s, %(pages)s pages"
-msgstr "%(format)s, %(pages)s Seiten"
-
-#: bookwyrm/templates/book/book.html:81
-#, python-format
-msgid "%(pages)s pages"
-msgstr "%(pages)s Seiten"
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr "Am %(date)s von %(publisher)s veröffentlicht."
-
-#: bookwyrm/templates/book/book.html:88
-#, fuzzy, python-format
-#| msgid "Published date:"
-msgid "Published %(date)s"
-msgstr "Veröffentlichungsdatum:"
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr "Veröffentlicht von %(publisher)s."
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Speichern"
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -205,77 +199,77 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, fuzzy, 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>\""
 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 "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Tag hinzufügen"
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr "bewertet"
 
@@ -424,7 +418,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr ""
 
@@ -433,6 +427,7 @@ msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
@@ -457,98 +452,102 @@ msgstr ""
 msgid "Openlibrary key:"
 msgstr ""
 
+#: bookwyrm/templates/book/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr "Editionen von  %(book_title)s"
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr "%(format)s, %(pages)s Seiten"
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, python-format
+msgid "%(pages)s pages"
+msgstr "%(pages)s Seiten"
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "%(languages)s language"
+msgstr "%(pages)s Seiten"
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr "Am %(date)s von %(publisher)s veröffentlicht."
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Veröffentlichungsdatum:"
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr "Veröffentlicht von %(publisher)s."
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "Schließen"
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
-#: bookwyrm/templates/layout.html:97
-msgid "Directory"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:19
-msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
-
-#: bookwyrm/templates/directory.html:31
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Nachricht verwerfen"
-
-#: bookwyrm/templates/directory.html:44
-#, fuzzy
-#| msgid "Show less"
-msgid "Show filters"
-msgstr "Weniger anzeigen"
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-#, fuzzy
-#| msgid "User Activity"
-msgid "User type"
-msgstr "Nutzer*innenaktivität"
-
-#: bookwyrm/templates/directory.html:58
-msgid "BookWyrm users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
+#: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
 msgid "Community"
 msgstr "Kommentieren"
 
-#: bookwyrm/templates/directory.html:71
+#: bookwyrm/templates/directory/community_filter.html:8
 #, fuzzy
 #| msgid "Max uses"
 msgid "Local users"
 msgstr "Maximale Benutzungen"
 
-#: bookwyrm/templates/directory.html:75
+#: bookwyrm/templates/directory/community_filter.html:12
 #, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
 msgstr "Föderiert"
 
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:84
-#, fuzzy
-#| msgid "Suggest"
-msgid "Suggested"
-msgstr "Vorschlagen"
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
+#: bookwyrm/templates/directory/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
+#: bookwyrm/templates/directory/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
 
-#: bookwyrm/templates/directory.html:94
-#, fuzzy
-#| msgid "Clear search"
-msgid "Clear filters"
-msgstr "Suche leeren"
+#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Nachricht verwerfen"
 
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
@@ -556,7 +555,7 @@ msgid_plural "followers you follow"
 msgstr[0] "folgt dir"
 msgstr[1] "folgt dir"
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
@@ -564,14 +563,42 @@ msgid_plural "books on your shelves"
 msgstr[0] "Deine Regale"
 msgstr[1] "Deine Regale"
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Vorschlagen"
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Nutzer*innenaktivität"
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -681,16 +708,6 @@ msgstr ""
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/editions.html:5
-#, python-format
-msgid "Editions of %(book_title)s"
-msgstr "Editionen von  %(book_title)s"
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -757,18 +774,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr "Über %(site_name)s"
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr "Ups!"
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr ""
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr "Etwas lief schief. Entschuldigung!"
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -845,6 +850,8 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Deine Bücher"
 
@@ -853,14 +860,14 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
@@ -868,7 +875,7 @@ msgstr "Gerade lesend"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr "Gelesen"
 
@@ -913,27 +920,33 @@ msgstr "%(username)ss %(year)s Bücher"
 msgid "Import Books"
 msgstr "Bücher importieren"
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+#, fuzzy
+#| msgid "Data source"
+msgid "Data source:"
 msgstr "Datenquelle"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
 msgid "Include reviews"
 msgstr "Bewertungen importieren"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr "Datenschutzeinstellung für importierte Bewertungen"
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr "Importieren"
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr "Keine aktuellen Importe"
 
@@ -990,12 +1003,12 @@ msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr "Autor*in"
 
@@ -1051,10 +1064,6 @@ msgstr "Suche"
 msgid "Main navigation menu"
 msgstr "Navigationshauptmenü"
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "Deine Regale"
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr ""
@@ -1069,7 +1078,7 @@ msgid "Settings"
 msgstr "Einstellungen"
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1131,7 +1140,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr "Liste erstellen"
 
@@ -1197,7 +1206,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "Alle können Bücher vorschlagen, du kannst diese bestätigen"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr "Offen"
 
@@ -1216,6 +1225,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1252,20 +1262,6 @@ msgstr "Keine Bücher gefunden"
 msgid "Suggest"
 msgstr "Vorschlagen"
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr "Deine Listen"
-
-#: bookwyrm/templates/lists/lists.html:32
-#, fuzzy, python-format
-#| msgid "See all %(size)s"
-msgid "See all %(size)s lists"
-msgstr "Alle %(size)s anzeigen"
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr "Aktuelle Listen"
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -1379,27 +1375,37 @@ msgstr "Wiedereröffnen"
 msgid "Resolve"
 msgstr "Lösen"
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Reports: %(server_name)s"
+msgstr "Listen: %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr "Listen: %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:27
 #, fuzzy
 #| msgid "Shelved"
 msgid "Resolved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr "Nicht gefunden"
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
-msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
+#: bookwyrm/templates/moderation/reports.html:34
+#, fuzzy
+#| msgid "No books found"
+msgid "No reports found."
+msgstr "Keine Bücher gefunden"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1631,51 +1637,129 @@ msgstr ""
 msgid "Manage Users"
 msgstr "Nutzer*innen verwalten"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Föderierende Server"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr "Instanzeinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Seiteneinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Instanzinformationen"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Bilder"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registrierung"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to server list"
+msgstr "Zurück zu den Meldungen"
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+msgid "Software:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:19
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "Beschreibung:"
+
+#: bookwyrm/templates/settings/federated_server.html:23
+#, fuzzy
+#| msgid "Import Status"
+msgid "Status:"
+msgstr "Importstatus"
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "Aktivität"
+
+#: bookwyrm/templates/settings/federated_server.html:33
+msgid "Users:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports:"
+msgstr "Aktuelle Importe"
+
+#: bookwyrm/templates/settings/federated_server.html:47
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by us:"
+msgstr "folgt dir"
+
+#: bookwyrm/templates/settings/federated_server.html:53
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by them:"
+msgstr "folgt dir"
+
+#: bookwyrm/templates/settings/federated_server.html:59
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by us:"
+msgstr "Blockierte Nutzer*innen"
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "Servername"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+#, fuzzy
+#| msgid "Federated"
+msgid "Date federated"
+msgstr "Föderiert"
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr ""
 
@@ -1846,6 +1930,47 @@ msgstr "Folgeanfragen"
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+#, fuzzy
+#| msgid "username"
+msgid "Username"
+msgstr "Username"
+
+#: bookwyrm/templates/settings/user_admin.html:24
+#, fuzzy
+#| msgid "Added:"
+msgid "Date Added"
+msgstr "Hinzugefügt:"
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "Entfernen"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "Aktivität"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""
@@ -1906,7 +2031,7 @@ msgid "Review:"
 msgstr "Bewerten"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr ""
 
@@ -1980,6 +2105,26 @@ msgstr "Status favorisieren"
 msgid "Un-like status"
 msgstr "Favorisieren zurücknehmen"
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Weniger anzeigen"
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Suche leeren"
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "Folgen"
@@ -2113,32 +2258,32 @@ msgstr "Raten"
 msgid "Rate"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr "Fortschrittsupdates:"
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr "Zeige alle Updates"
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr "Dieses Fortschrittsupdate löschen"
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr "Angefangen"
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr "Lesedaten bearbeiten"
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "Delete these read dates"
 msgstr "Diese Lesedaten löschen"
 
@@ -2202,45 +2347,11 @@ msgstr "von %(author)s"
 msgid "Import book"
 msgstr "Buch importieren"
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr "Veröffentlicht"
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr "Ins Regal gestellt"
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr "Gestartet"
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr "Abgeschlossen"
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr "Eterne Links"
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr "Dieses Regal ist leer."
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr "Regal löschen"
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr "Regal wechseln"
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
-msgstr "Vom Regal nehmen"
+#, fuzzy
+#| msgid "Your books"
+msgid "Move book"
+msgstr "Deine Bücher"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2248,7 +2359,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" abschließen"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 #, fuzzy
 #| msgid "Progress"
 msgid "Update progress"
@@ -2271,6 +2382,12 @@ msgstr "Lesen abschließen"
 msgid "Want to read"
 msgstr "Auf Leseliste setzen"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Remove from %(name)s"
+msgstr "Listen: %(username)s"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2343,6 +2460,18 @@ msgstr "Mehr Optionen"
 msgid "Switch to this edition"
 msgstr "Zu dieser Edition wechseln"
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted asccending"
+msgstr "Zu lesen angefangen"
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted descending"
+msgstr "Zu lesen angefangen"
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr "Tag entfernen"
@@ -2352,6 +2481,12 @@ msgstr "Tag entfernen"
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "Mit \"%(tag.name)s\" markierte Bücher"
 
+#: bookwyrm/templates/user/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s's %(year)s Books"
+msgid "%(username)s's books"
+msgstr "%(username)ss %(year)s Bücher"
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2397,56 +2532,62 @@ msgstr "Listen: %(username)s"
 msgid "Create list"
 msgstr "Liste Erstellen"
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr "Deine Regale"
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr "%(username)s: Regale"
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr "Ins Regal gestellt"
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr "Gestartet"
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr "Abgeschlossen"
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr "Dieses Regal ist leer."
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr "Regal löschen"
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr "Regale"
-
-#: bookwyrm/templates/user/user.html:31
-#, python-format
-msgid "See all %(size)s"
+#: bookwyrm/templates/user/user.html:33
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr "Alle %(size)s anzeigen"
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr "Alle %(shelf_count)s Regale anzeigen"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
+msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Leseziel für %(year)s setzen"
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr "Nutzer*innenaktivität"
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr "Noch keine Aktivitäten!"
 
@@ -2454,14 +2595,16 @@ msgstr "Noch keine Aktivitäten!"
 msgid "Follow Requests"
 msgstr "Folgeanfragen"
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr "Aktivität"
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "Leseziel"
 
+#: bookwyrm/templates/user/user_layout.html:68
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Buch"
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
@@ -2490,6 +2633,46 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#~ msgid "Your shelves"
+#~ msgstr "Deine Regale"
+
+#~ msgid "Your lists"
+#~ msgstr "Deine Listen"
+
+#, fuzzy, python-format
+#~| msgid "See all %(size)s"
+#~ msgid "See all %(size)s lists"
+#~ msgstr "Alle %(size)s anzeigen"
+
+#~ msgid "Recent Lists"
+#~ msgstr "Aktuelle Listen"
+
+#~ msgid "Published"
+#~ msgstr "Veröffentlicht"
+
+#~ msgid "External links"
+#~ msgstr "Eterne Links"
+
+#~ msgid "Change shelf"
+#~ msgstr "Regal wechseln"
+
+#~ msgid "Unshelve"
+#~ msgstr "Vom Regal nehmen"
+
+#~ msgid "Your Shelves"
+#~ msgstr "Deine Regale"
+
+#, python-format
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s: Regale"
+
+#~ msgid "Shelves"
+#~ msgstr "Regale"
+
+#, python-format
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "Alle %(shelf_count)s Regale anzeigen"
+
 #~ msgid "Send follow request"
 #~ msgstr "Folgeanfrage senden"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index e6256a7fa..190a5b1a3 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/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-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\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"
@@ -47,44 +47,64 @@ msgstr ""
 msgid "Unlimited"
 msgstr ""
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr ""
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: 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:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr ""
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr ""
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr ""
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr ""
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr ""
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr ""
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr ""
@@ -108,91 +128,66 @@ msgstr ""
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:79
-#, python-format
-msgid "%(format)s, %(pages)s pages"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:81
-#, python-format
-msgid "%(pages)s pages"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:88
-#, python-format
-msgid "Published %(date)s"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -200,72 +195,72 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, 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/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 msgid "Add to list"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr ""
 
@@ -401,7 +396,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr ""
 
@@ -410,6 +405,7 @@ msgid "Physical Properties"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
@@ -434,102 +430,136 @@ msgstr ""
 msgid "Openlibrary key:"
 msgstr ""
 
+#: bookwyrm/templates/book/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr ""
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr ""
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, python-format
+msgid "%(pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, python-format
+msgid "%(languages)s language"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, python-format
+msgid "Published %(date)s"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
+#: bookwyrm/templates/directory/community_filter.html:5
+msgid "Community"
+msgstr ""
+
+#: bookwyrm/templates/directory/community_filter.html:8
+msgid "Local users"
+msgstr ""
+
+#: bookwyrm/templates/directory/community_filter.html:12
+msgid "Federated community"
+msgstr ""
+
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
 #: bookwyrm/templates/layout.html:97
 msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:19
+#: bookwyrm/templates/directory/directory.html:19
 msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:26
+#: bookwyrm/templates/directory/directory.html:26
 #, python-format
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:31
+#: bookwyrm/templates/directory/directory.html:31
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:44
-msgid "Show filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-msgid "User type"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:58
-msgid "BookWyrm users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
-msgid "Community"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:71
-msgid "Local users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:75
-msgid "Federated community"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:84
-msgid "Suggested"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:94
-msgid "Clear filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+msgid "Suggested"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+msgid "User type"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -637,16 +667,6 @@ msgstr ""
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/editions.html:5
-#, python-format
-msgid "Editions of %(book_title)s"
-msgstr ""
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr ""
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -709,18 +729,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr ""
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr ""
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr ""
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr ""
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -795,6 +803,8 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr ""
 
@@ -803,18 +813,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "To Read"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 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
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr ""
 
@@ -859,27 +869,31 @@ msgstr ""
 msgid "Import Books"
 msgstr ""
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+msgid "Data source:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:32
-msgid "Include reviews"
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
 msgstr ""
 
 #: bookwyrm/templates/import.html:37
+msgid "Include reviews"
+msgstr ""
+
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr ""
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr ""
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr ""
 
@@ -936,12 +950,12 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr ""
 
@@ -997,10 +1011,6 @@ msgstr ""
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr ""
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr ""
@@ -1015,7 +1025,7 @@ msgid "Settings"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1077,7 +1087,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr ""
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr ""
 
@@ -1141,7 +1151,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr ""
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr ""
 
@@ -1159,6 +1169,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr ""
 
@@ -1195,19 +1206,6 @@ msgstr ""
 msgid "Suggest"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:14
-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 ""
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -1311,22 +1309,28 @@ msgstr ""
 msgid "Resolve"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, python-format
+msgid "Reports: %(server_name)s"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 msgid "Reports"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, python-format
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:27
 msgid "Resolved"
 msgstr ""
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr ""
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
+#: bookwyrm/templates/moderation/reports.html:34
+msgid "No reports found."
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:14
@@ -1559,51 +1563,113 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+msgid "Back to server list"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+msgid "Software:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:19
+msgid "Version:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:23
+msgid "Status:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:33
+msgid "Users:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+msgid "Reports:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:47
+msgid "Followed by us:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:53
+msgid "Followed by them:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:59
+msgid "Blocked by us:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+msgid "Date federated"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr ""
 
@@ -1762,6 +1828,39 @@ msgstr ""
 msgid "Registration closed text:"
 msgstr ""
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+msgid "Username"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:24
+msgid "Date Added"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+msgid "Remote server"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""
@@ -1816,7 +1915,7 @@ msgid "Review:"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr ""
 
@@ -1890,6 +1989,22 @@ msgstr ""
 msgid "Un-like status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+msgid "Show filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+msgid "Clear filters"
+msgstr ""
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr ""
@@ -2020,32 +2135,32 @@ msgstr ""
 msgid "Rate"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "Delete these read dates"
 msgstr ""
 
@@ -2105,44 +2220,8 @@ msgstr ""
 msgid "Import book"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr ""
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
+msgid "Move book"
 msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
@@ -2151,7 +2230,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 msgid "Update progress"
 msgstr ""
 
@@ -2172,6 +2251,11 @@ msgstr ""
 msgid "Want to read"
 msgstr ""
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, python-format
+msgid "Remove from %(name)s"
+msgstr ""
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2240,6 +2324,14 @@ msgstr ""
 msgid "Switch to this edition"
 msgstr ""
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+msgid "Sorted asccending"
+msgstr ""
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+msgid "Sorted descending"
+msgstr ""
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr ""
@@ -2249,6 +2341,11 @@ msgstr ""
 msgid "Books tagged \"%(tag.name)s\""
 msgstr ""
 
+#: bookwyrm/templates/user/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr ""
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2294,56 +2391,61 @@ msgstr ""
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr ""
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr ""
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr ""
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr ""
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:31
+#: bookwyrm/templates/user/user.html:33
 #, python-format
-msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr ""
 
@@ -2351,14 +2453,14 @@ msgstr ""
 msgid "Follow Requests"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr ""
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr ""
 
+#: bookwyrm/templates/user/user_layout.html:68
+msgid "Books"
+msgstr ""
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a0e975bfd..d57846194 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 729048eb7..7e53903e4 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/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-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,44 +49,64 @@ msgstr "%(count)d usos"
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s no es un remote_id válido"
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "nombre de usuario"
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr "No encontrado"
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "¡Parece que la página solicitada no existe!"
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr "¡Úps!"
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr "Error de servidor"
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "¡Algo salió mal! Disculpa."
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr "Editar Autor/Autora"
@@ -110,92 +130,66 @@ msgstr "por"
 msgid "Edit Book"
 msgstr "Editar Libro"
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN:"
 
-#: bookwyrm/templates/book/book.html:79
-#, python-format
-msgid "%(format)s, %(pages)s pages"
-msgstr "%(format)s, %(pages)s páginas"
-
-#: bookwyrm/templates/book/book.html:81
-#, python-format
-msgid "%(pages)s pages"
-msgstr "%(pages)s páginas"
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:88
-#, fuzzy, python-format
-#| msgid "Published date:"
-msgid "Published %(date)s"
-msgstr "Fecha de publicación:"
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Guardar"
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -203,74 +197,74 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, 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 "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Agregar etiqueta"
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Irse a lista"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Agregar"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr "lo calificó con"
 
@@ -419,7 +413,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr "Portada:"
 
@@ -428,6 +422,7 @@ msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
@@ -452,98 +447,102 @@ msgstr "ISBN 10:"
 msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
 
+#: bookwyrm/templates/book/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr "Ediciones de %(book_title)s"
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr "%(format)s, %(pages)s páginas"
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, python-format
+msgid "%(pages)s pages"
+msgstr "%(pages)s páginas"
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "%(languages)s language"
+msgstr "%(pages)s páginas"
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Fecha de publicación:"
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "Cerrar"
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
-#: bookwyrm/templates/layout.html:97
-msgid "Directory"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:19
-msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
-
-#: bookwyrm/templates/directory.html:31
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Desechar mensaje"
-
-#: bookwyrm/templates/directory.html:44
-#, fuzzy
-#| msgid "Show less"
-msgid "Show filters"
-msgstr "Mostrar menos"
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-#, fuzzy
-#| msgid "User Activity"
-msgid "User type"
-msgstr "Actividad de usuario"
-
-#: bookwyrm/templates/directory.html:58
-msgid "BookWyrm users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
+#: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
 msgid "Community"
 msgstr "Comentario"
 
-#: bookwyrm/templates/directory.html:71
+#: bookwyrm/templates/directory/community_filter.html:8
 #, fuzzy
 #| msgid "Max uses"
 msgid "Local users"
 msgstr "Número máximo de usos"
 
-#: bookwyrm/templates/directory.html:75
+#: bookwyrm/templates/directory/community_filter.html:12
 #, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
 msgstr "Federalizado"
 
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:84
-#, fuzzy
-#| msgid "Suggest"
-msgid "Suggested"
-msgstr "Sugerir"
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
+#: bookwyrm/templates/directory/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
+#: bookwyrm/templates/directory/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
 
-#: bookwyrm/templates/directory.html:94
-#, fuzzy
-#| msgid "Clear search"
-msgid "Clear filters"
-msgstr "Borrar búsqueda"
+#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Desechar mensaje"
 
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
@@ -551,7 +550,7 @@ msgid_plural "followers you follow"
 msgstr[0] "te siguió"
 msgstr[1] "te siguió"
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
@@ -559,14 +558,42 @@ msgid_plural "books on your shelves"
 msgstr[0] "Tus estantes"
 msgstr[1] "Tus estantes"
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Sugerir"
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Actividad de usuario"
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -676,16 +703,6 @@ msgstr "Clave Librarything:"
 msgid "Goodreads key:"
 msgstr "Clave Goodreads:"
 
-#: bookwyrm/templates/editions.html:5
-#, python-format
-msgid "Editions of %(book_title)s"
-msgstr "Ediciones de %(book_title)s"
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -752,18 +769,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr "Sobre %(site_name)s"
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr "¡Úps!"
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr "Error de servidor"
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr "¡Algo salió mal! Disculpa."
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -842,6 +847,8 @@ msgid "Updates"
 msgstr "Actualizaciones"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Tus libros"
 
@@ -850,18 +857,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "To Read"
 msgstr "Para leer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr "Leer"
 
@@ -906,27 +913,33 @@ msgstr "Los libros de %(username)s para %(year)s"
 msgid "Import Books"
 msgstr "Importar libros"
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+#, fuzzy
+#| msgid "Data source"
+msgid "Data source:"
 msgstr "Fuente de datos"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
 msgid "Include reviews"
 msgstr "Incluir reseñas"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr "Configuración de privacidad para las reseñas importadas:"
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr "Importar"
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr "Importaciones recientes"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr "No hay ninguna importación reciente"
 
@@ -983,12 +996,12 @@ msgstr "Libro"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr "Autor/Autora"
 
@@ -1044,10 +1057,6 @@ msgstr "Buscar"
 msgid "Main navigation menu"
 msgstr "Menú de navigación central"
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "Tus estantes"
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "Actividad"
@@ -1062,7 +1071,7 @@ msgid "Settings"
 msgstr "Configuración"
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1124,7 +1133,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr "Crear lista"
 
@@ -1190,7 +1199,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr "Abierto"
 
@@ -1208,6 +1217,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1244,19 +1254,6 @@ msgstr "No se encontró ningún libro"
 msgid "Suggest"
 msgstr "Sugerir"
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr "Tus listas"
-
-#: bookwyrm/templates/lists/lists.html:32
-#, python-format
-msgid "See all %(size)s lists"
-msgstr "Ver las %(size)s listas"
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr "Listas recientes"
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Iniciar sesión"
@@ -1370,27 +1367,37 @@ msgstr ""
 msgid "Resolve"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Reports: %(server_name)s"
+msgstr "Listas: %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Importaciones recientes"
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr "Listas: %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:27
 #, fuzzy
 #| msgid "Shelved"
 msgid "Resolved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr "No encontrado"
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
-msgstr "¡Parece que la página solicitada no existe!"
+#: bookwyrm/templates/moderation/reports.html:34
+#, fuzzy
+#| msgid "No books found"
+msgid "No reports found."
+msgstr "No se encontró ningún libro"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1622,51 +1629,131 @@ msgstr "Adminstración"
 msgid "Manage Users"
 msgstr "Administrar usuarios"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Servidores federalizados"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr "Configuración de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Configuración de sitio"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Información de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Imagenes"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenido del pie de página"
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registración"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+msgid "Back to server list"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+#, fuzzy
+#| msgid "Software"
+msgid "Software:"
+msgstr "Software"
+
+#: bookwyrm/templates/settings/federated_server.html:19
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "Descripción:"
+
+#: bookwyrm/templates/settings/federated_server.html:23
+#, fuzzy
+#| msgid "Status"
+msgid "Status:"
+msgstr "Status"
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "Actividad"
+
+#: bookwyrm/templates/settings/federated_server.html:33
+#, fuzzy
+#| msgid "Username:"
+msgid "Users:"
+msgstr "Nombre de usuario:"
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports:"
+msgstr "Importaciones recientes"
+
+#: bookwyrm/templates/settings/federated_server.html:47
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by us:"
+msgstr "te siguió"
+
+#: bookwyrm/templates/settings/federated_server.html:53
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by them:"
+msgstr "te siguió"
+
+#: bookwyrm/templates/settings/federated_server.html:59
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by us:"
+msgstr "Usuarios bloqueados"
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "Nombre de servidor"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+#, fuzzy
+#| msgid "Federated"
+msgid "Date federated"
+msgstr "Federalizado"
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr "Software"
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "Status"
 
@@ -1835,6 +1922,47 @@ msgstr "Solicitudes de seguidor"
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "Nombre de usuario:"
+
+#: bookwyrm/templates/settings/user_admin.html:24
+#, fuzzy
+#| msgid "Added:"
+msgid "Date Added"
+msgstr "Agregado:"
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "Quitar"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "Actividad"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "Bloquear"
@@ -1895,7 +2023,7 @@ msgid "Review:"
 msgstr "Reseña"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr "Calificación"
 
@@ -1969,6 +2097,26 @@ msgstr "Me gusta status"
 msgid "Un-like status"
 msgstr "Quitar me gusta de status"
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Mostrar menos"
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Borrar búsqueda"
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "Seguir"
@@ -2102,32 +2250,32 @@ msgstr "Da una calificación"
 msgid "Rate"
 msgstr "Calificar"
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr "Actualizaciones de progreso:"
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr "terminado"
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr "Mostrar todas las actualizaciones"
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr "Eliminar esta actualización de progreso"
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr "empezado"
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr "Editar fechas de lectura"
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "Delete these read dates"
 msgstr "Eliminar estas fechas de lectura"
 
@@ -2191,45 +2339,11 @@ msgstr "por %(author)s"
 msgid "Import book"
 msgstr "Importar libro"
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr "Publicado"
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr "Archivado"
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr "Empezado"
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr "Terminado"
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr "Enlaces externos"
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr "OpenLibrary"
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr "Este estante está vacio."
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr "Eliminar estante"
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr "Cambiar estante"
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
-msgstr "Retirar del estante"
+#, fuzzy
+#| msgid "Your books"
+msgid "Move book"
+msgstr "Tus libros"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2237,7 +2351,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminar \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 #, fuzzy
 #| msgid "Updates"
 msgid "Update progress"
@@ -2260,6 +2374,12 @@ msgstr "Terminar de leer"
 msgid "Want to read"
 msgstr "Quiero leer"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Remove from %(name)s"
+msgstr "Listas: %(username)s"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2332,6 +2452,18 @@ msgstr "Más opciones"
 msgid "Switch to this edition"
 msgstr "Cambiar a esta edición"
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted asccending"
+msgstr "Lectura se empezó"
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted descending"
+msgstr "Lectura se empezó"
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr "Eliminar etiqueta"
@@ -2341,6 +2473,12 @@ msgstr "Eliminar etiqueta"
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "Libros etiquetados con \"%(tag.name)s\""
 
+#: bookwyrm/templates/user/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s's %(year)s Books"
+msgid "%(username)s's books"
+msgstr "Los libros de %(username)s para %(year)s"
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2386,56 +2524,62 @@ msgstr "Listas: %(username)s"
 msgid "Create list"
 msgstr "Crear lista"
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr "Tus estantes"
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr "%(username)s: Estantes"
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr "Crear estante"
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr "Editar estante"
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr "Archivado"
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr "Empezado"
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr "Terminado"
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr "Este estante está vacio."
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr "Eliminar estante"
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "Editar perfil"
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr "Estantes"
-
-#: bookwyrm/templates/user/user.html:31
-#, python-format
-msgid "See all %(size)s"
+#: bookwyrm/templates/user/user.html:33
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr "Ver %(size)s"
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr "Ver los %(shelf_count)s estantes"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
+msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Establecer una meta de lectura para %(year)s"
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr "Actividad de usuario"
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr "¡Aún no actividades!"
 
@@ -2443,14 +2587,16 @@ msgstr "¡Aún no actividades!"
 msgid "Follow Requests"
 msgstr "Solicitudes de seguidor"
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr "Actividad"
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "Meta de lectura"
 
+#: bookwyrm/templates/user/user_layout.html:68
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Libro"
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
@@ -2479,6 +2625,48 @@ msgstr "Ya existe un usuario con ese nombre."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#~ msgid "Your shelves"
+#~ msgstr "Tus estantes"
+
+#~ msgid "Your lists"
+#~ msgstr "Tus listas"
+
+#, python-format
+#~ msgid "See all %(size)s lists"
+#~ msgstr "Ver las %(size)s listas"
+
+#~ msgid "Recent Lists"
+#~ msgstr "Listas recientes"
+
+#~ msgid "Published"
+#~ msgstr "Publicado"
+
+#~ msgid "External links"
+#~ msgstr "Enlaces externos"
+
+#~ msgid "OpenLibrary"
+#~ msgstr "OpenLibrary"
+
+#~ msgid "Change shelf"
+#~ msgstr "Cambiar estante"
+
+#~ msgid "Unshelve"
+#~ msgstr "Retirar del estante"
+
+#~ msgid "Your Shelves"
+#~ msgstr "Tus estantes"
+
+#, python-format
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s: Estantes"
+
+#~ msgid "Shelves"
+#~ msgstr "Estantes"
+
+#, python-format
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "Ver los %(shelf_count)s estantes"
+
 #~ msgid "Send follow request"
 #~ msgstr "Envia solicitud de seguidor"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 99a9b6cc5..f3f76f03d 100644
Binary files a/locale/fr_FR/LC_MESSAGES/django.mo and b/locale/fr_FR/LC_MESSAGES/django.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 66ee8cf16..6c6ecb407 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -49,46 +49,66 @@ msgstr ""
 msgid "Unlimited"
 msgstr "Non listé"
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr ""
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: 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:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 #, fuzzy
 #| msgid "Username:"
 msgid "username"
 msgstr "Nom d’utilisateur :"
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr ""
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr "Introuvable"
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr "Oups !"
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr "Erreur côté serveur"
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "Une erreur s’est produite ; désolé !"
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
@@ -112,96 +132,68 @@ msgstr ""
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN :"
 
-#: bookwyrm/templates/book/book.html:79
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
-msgid "%(format)s, %(pages)s pages"
-msgstr "sur %(book.pages)s pages"
-
-#: bookwyrm/templates/book/book.html:81
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
-msgid "%(pages)s pages"
-msgstr "sur %(book.pages)s pages"
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:88
-#, fuzzy, python-format
-#| msgid "Published date:"
-msgid "Published %(date)s"
-msgstr "Date de publication :"
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 #, fuzzy
 #| msgid "Description:"
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -209,79 +201,79 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, fuzzy, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 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 " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 #, fuzzy
 #| msgid "Edit read dates"
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr "Tags"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Ajouter un tag"
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Aller à la liste"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr "l’a noté"
 
@@ -430,7 +422,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr "Couverture"
 
@@ -439,6 +431,7 @@ msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
@@ -463,6 +456,60 @@ msgstr "ISBN 10 :"
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
+#: bookwyrm/templates/book/editions.html:5
+#, fuzzy, python-format
+#| msgid "Finish \"<em>%(book_title)s</em>\""
+msgid "Editions of %(book_title)s"
+msgstr "Éditions de %(book_title)s"
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(format)s, %(pages)s pages"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(pages)s pages"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(languages)s language"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Date de publication :"
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 #, fuzzy
@@ -470,95 +517,46 @@ msgstr "Clé Openlibrary :"
 msgid "Close"
 msgstr "Fermer"
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
-#: bookwyrm/templates/layout.html:97
-msgid "Directory"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:19
-msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
-
-#: bookwyrm/templates/directory.html:31
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Rejeter le message"
-
-#: bookwyrm/templates/directory.html:44
-#, fuzzy
-#| msgid "Show less"
-msgid "Show filters"
-msgstr "Replier"
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-#, fuzzy
-#| msgid "User Activity"
-msgid "User type"
-msgstr "Activité du compte"
-
-#: bookwyrm/templates/directory.html:58
-#, fuzzy
-#| msgid "Blocked users"
-msgid "BookWyrm users"
-msgstr "Comptes bloqués"
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
+#: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
 msgid "Community"
 msgstr "Commentaire"
 
-#: bookwyrm/templates/directory.html:71
+#: bookwyrm/templates/directory/community_filter.html:8
 #, fuzzy
 #| msgid "Blocked users"
 msgid "Local users"
 msgstr "Comptes bloqués"
 
-#: bookwyrm/templates/directory.html:75
+#: bookwyrm/templates/directory/community_filter.html:12
 #, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
 msgstr "Fédéré"
 
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:84
-#, fuzzy
-#| msgid "Suggest"
-msgid "Suggested"
-msgstr "Suggérer"
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
+#: bookwyrm/templates/directory/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
+#: bookwyrm/templates/directory/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
 
-#: bookwyrm/templates/directory.html:94
-#, fuzzy
-#| msgid "Clear search"
-msgid "Clear filters"
-msgstr "Vider la requête"
+#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Rejeter le message"
 
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
@@ -566,7 +564,7 @@ msgid_plural "followers you follow"
 msgstr[0] "s’est abonné(e)"
 msgstr[1] "s’est abonné(e)"
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
@@ -574,14 +572,44 @@ msgid_plural "books on your shelves"
 msgstr[0] "Vos étagères"
 msgstr[1] "Vos étagères"
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Suggérer"
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Activité du compte"
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+#, fuzzy
+#| msgid "Blocked users"
+msgid "BookWyrm users"
+msgstr "Comptes bloqués"
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, fuzzy, python-format
 #| msgid "Join %(name)s"
@@ -692,17 +720,6 @@ msgstr "Clé Librarything :"
 msgid "Goodreads key:"
 msgstr "Clé Goodreads :"
 
-#: bookwyrm/templates/editions.html:5
-#, fuzzy, python-format
-#| msgid "Finish \"<em>%(book_title)s</em>\""
-msgid "Editions of %(book_title)s"
-msgstr "Éditions de %(book_title)s"
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -769,18 +786,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr "À propos de %(name)s"
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr "Oups !"
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr "Erreur côté serveur"
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr "Une erreur s’est produite ; désolé !"
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -861,6 +866,8 @@ msgid "Updates"
 msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
 
@@ -869,14 +876,14 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Lu"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 #, fuzzy
 #| msgid "Started reading"
 msgid "Currently Reading"
@@ -884,7 +891,7 @@ msgstr "Commencer la lecture"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr "Lu"
 
@@ -933,27 +940,33 @@ msgstr "Livres de %(username)s en %(year)s"
 msgid "Import Books"
 msgstr "Importer des livres"
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+#, fuzzy
+#| msgid "Data source"
+msgid "Data source:"
 msgstr "Source de données"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
 msgid "Include reviews"
 msgstr "Importer les critiques"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr "Confidentialité des critiques importées :"
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr "Importer"
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr "Importations récentes"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr "Aucune importation récente"
 
@@ -1010,12 +1023,12 @@ msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr "Auteur ou autrice"
 
@@ -1071,10 +1084,6 @@ msgstr "Chercher"
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "Vos étagères"
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "Fil d’actualité"
@@ -1091,7 +1100,7 @@ msgid "Settings"
 msgstr "Paramètres de l’instance"
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1155,7 +1164,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr "Créer une liste"
 
@@ -1221,7 +1230,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr "Ouverte"
 
@@ -1240,6 +1249,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1276,20 +1286,6 @@ msgstr "Aucun livre trouvé"
 msgid "Suggest"
 msgstr "Suggérer"
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr "Vos listes"
-
-#: bookwyrm/templates/lists/lists.html:32
-#, fuzzy, python-format
-#| msgid "See all %(size)s"
-msgid "See all %(size)s lists"
-msgstr "Voir les %(size)s"
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr "Listes récentes"
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@@ -1403,27 +1399,37 @@ msgstr ""
 msgid "Resolve"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Reports: %(server_name)s"
+msgstr "Listes : %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Importations récentes"
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr "Listes : %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:27
 #, fuzzy
 #| msgid "Shelved"
 msgid "Resolved"
 msgstr "Ajouté à une étagère"
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr "Introuvable"
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
-msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
+#: bookwyrm/templates/moderation/reports.html:34
+#, fuzzy
+#| msgid "No books found"
+msgid "No reports found."
+msgstr "Aucun livre trouvé"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1655,16 +1661,23 @@ msgstr "Administration"
 msgid "Manage Users"
 msgstr "Gérer les comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Serveurs fédérés"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 #, fuzzy
@@ -1672,36 +1685,109 @@ msgstr "Paramètres de l’instance"
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Information sur l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Images"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Enregistrement"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+msgid "Back to server list"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+#, fuzzy
+#| msgid "Software"
+msgid "Software:"
+msgstr "Logiciel"
+
+#: bookwyrm/templates/settings/federated_server.html:19
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "Description :"
+
+#: bookwyrm/templates/settings/federated_server.html:23
+#, fuzzy
+#| msgid "Status"
+msgid "Status:"
+msgstr "Statut"
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "Activité"
+
+#: bookwyrm/templates/settings/federated_server.html:33
+#, fuzzy
+#| msgid "Username:"
+msgid "Users:"
+msgstr "Nom d’utilisateur :"
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports:"
+msgstr "Importations récentes"
+
+#: bookwyrm/templates/settings/federated_server.html:47
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by us:"
+msgstr "s’est abonné(e)"
+
+#: bookwyrm/templates/settings/federated_server.html:53
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by them:"
+msgstr "s’est abonné(e)"
+
+#: bookwyrm/templates/settings/federated_server.html:59
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by us:"
+msgstr "Comptes bloqués"
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "Nom du serveur"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+#, fuzzy
+#| msgid "Federated"
+msgid "Date federated"
+msgstr "Fédéré"
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr "Logiciel"
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "Statut"
 
@@ -1870,6 +1956,47 @@ msgstr "Demandes d’abonnement"
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "Nom d’utilisateur :"
+
+#: bookwyrm/templates/settings/user_admin.html:24
+#, fuzzy
+#| msgid "added"
+msgid "Date Added"
+msgstr "a ajouté"
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "Supprimer"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "Activité"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "Bloquer"
@@ -1928,7 +2055,7 @@ msgid "Review:"
 msgstr "Critique"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr "Note"
 
@@ -2002,6 +2129,26 @@ msgstr "Ajouter le statut aux favoris"
 msgid "Un-like status"
 msgstr "Supprimer le statut des favoris"
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Replier"
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Vider la requête"
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "S’abonner"
@@ -2135,32 +2282,32 @@ msgstr "Laisser une note"
 msgid "Rate"
 msgstr "Noter"
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr "terminé"
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr "Montrer toutes les progressions"
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr "Supprimer cette mise à jour"
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr "commencé"
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 #, fuzzy
 #| msgid "Delete these read dates?"
 msgid "Delete these read dates"
@@ -2226,45 +2373,11 @@ msgstr "par %(author)s"
 msgid "Import book"
 msgstr "Importer le livre"
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr "Publié"
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr "Ajouté à une étagère"
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr "Commencé"
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr "Terminé"
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr "Liens externes"
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr "OpenLibrary"
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr "Cette étagère est vide"
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr "Supprimer l’étagère"
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr "Changer d’étagère"
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
-msgstr "Enlever de l’étagère"
+#, fuzzy
+#| msgid "Your books"
+msgid "Move book"
+msgstr "Vos livres"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2272,7 +2385,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 #, fuzzy
 #| msgid "Updated:"
 msgid "Update progress"
@@ -2299,6 +2412,12 @@ msgstr "Terminer la lecture"
 msgid "Want to read"
 msgstr "Je veux le lire"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Remove from %(name)s"
+msgstr "Listes : %(username)s"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2371,6 +2490,18 @@ msgstr "Plus d’options"
 msgid "Switch to this edition"
 msgstr "Changer vers cette édition"
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted asccending"
+msgstr "Lecture commencée le"
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted descending"
+msgstr "Lecture commencée le"
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr "Supprimer le tag"
@@ -2380,6 +2511,12 @@ msgstr "Supprimer le tag"
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "Livres tagués « %(tag.name)s »"
 
+#: bookwyrm/templates/user/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s has no followers"
+msgid "%(username)s's books"
+msgstr "Livres de %(username)s en %(year)s"
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2426,56 +2563,62 @@ msgstr "Listes : %(username)s"
 msgid "Create list"
 msgstr "Créer une liste"
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr "Vos étagères"
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr "%(username)s : Étagères"
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr "Créer l’étagère"
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr "Ajouté à une étagère"
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr "Commencé"
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr "Terminé"
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr "Cette étagère est vide"
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr "Supprimer l’étagère"
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "Modifier le profil"
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr "Étagères"
-
-#: bookwyrm/templates/user/user.html:31
-#, python-format
-msgid "See all %(size)s"
+#: bookwyrm/templates/user/user.html:33
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr "Voir les %(size)s"
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr "Voir les %(shelf_count)s étagères"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
+msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Définir un défi lecture pour %(year)s"
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr "Activité du compte"
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr "Flux RSS"
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr "Aucune activité pour l’instant !"
 
@@ -2483,14 +2626,16 @@ msgstr "Aucune activité pour l’instant !"
 msgid "Follow Requests"
 msgstr "Demandes d’abonnement"
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr "Activité"
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "Défi lecture"
 
+#: bookwyrm/templates/user/user_layout.html:68
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Livre"
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
@@ -2518,6 +2663,49 @@ msgstr ""
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#~ msgid "Your shelves"
+#~ msgstr "Vos étagères"
+
+#~ msgid "Your lists"
+#~ msgstr "Vos listes"
+
+#, fuzzy, python-format
+#~| msgid "See all %(size)s"
+#~ msgid "See all %(size)s lists"
+#~ msgstr "Voir les %(size)s"
+
+#~ msgid "Recent Lists"
+#~ msgstr "Listes récentes"
+
+#~ msgid "Published"
+#~ msgstr "Publié"
+
+#~ msgid "External links"
+#~ msgstr "Liens externes"
+
+#~ msgid "OpenLibrary"
+#~ msgstr "OpenLibrary"
+
+#~ msgid "Change shelf"
+#~ msgstr "Changer d’étagère"
+
+#~ msgid "Unshelve"
+#~ msgstr "Enlever de l’étagère"
+
+#~ msgid "Your Shelves"
+#~ msgstr "Vos étagères"
+
+#, python-format
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s : Étagères"
+
+#~ msgid "Shelves"
+#~ msgstr "Étagères"
+
+#, python-format
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "Voir les %(shelf_count)s étagères"
+
 #~ msgid "Send follow request"
 #~ msgstr "Envoyer une demande d’abonnement"
 
@@ -2660,9 +2848,6 @@ msgstr ""
 #~ msgid "Added by"
 #~ msgstr "Ajouté par"
 
-#~ msgid "added"
-#~ msgstr "a ajouté"
-
 #~ msgid "suggested adding"
 #~ msgstr "a suggéré l’ajout de"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 62c4cd964..819542795 100644
Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and b/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 83f128e9a..2f547f10a 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -49,44 +49,64 @@ msgstr "%(count)d 次使用"
 msgid "Unlimited"
 msgstr "不受限"
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s 不是有效的 remote_id"
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s 不是有效的用户名"
 
-#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "用户名"
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr "已经存在使用该用户名的用户。"
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr "Español（西班牙语）"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr "未找到"
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "你请求的页面似乎并不存在！"
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr "哎呀！"
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr "服务器错误"
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "某些东西出错了！对不起啦。"
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr "编辑作者"
@@ -110,90 +130,65 @@ msgstr "作者"
 msgid "Edit Book"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "添加封面"
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "OCLC 号:"
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN:"
 
-#: bookwyrm/templates/book/book.html:79
-#, python-format
-msgid "%(format)s, %(pages)s pages"
-msgstr "%(format)s, %(pages)s 页"
-
-#: bookwyrm/templates/book/book.html:81
-#, python-format
-msgid "%(pages)s pages"
-msgstr "%(pages)s 页"
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr "在 %(date)s 由 %(publisher)s 出版。"
-
-#: bookwyrm/templates/book/book.html:88
-#, python-format
-msgid "Published %(date)s"
-msgstr "于 %(date)s 出版"
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr "由 %(publisher)s 出版。"
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 msgid "Add Description"
 msgstr "添加描述"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "描述:"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "保存"
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -201,72 +196,72 @@ msgstr "保存"
 msgid "Cancel"
 msgstr "取消"
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, 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 "本书的 <a href=\"%(book_path)s\">另一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr "标签"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "添加标签"
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 msgid "Add to list"
 msgstr "添加到列表"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "添加"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr "评价了"
 
@@ -402,7 +397,7 @@ msgid "John Doe, Jane Smith"
 msgstr "张三, 李四"
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr "封面"
 
@@ -411,6 +406,7 @@ msgid "Physical Properties"
 msgstr "实体性质"
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格式:"
 
@@ -435,119 +431,150 @@ msgstr "ISBN 10:"
 msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
 
+#: bookwyrm/templates/book/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr "%(book_title)s 的各版本"
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr "%(format)s, %(pages)s 页"
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, python-format
+msgid "%(pages)s pages"
+msgstr "%(pages)s 页"
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "%(languages)s language"
+msgstr "%(pages)s 页"
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr "在 %(date)s 由 %(publisher)s 出版。"
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, python-format
+msgid "Published %(date)s"
+msgstr "于 %(date)s 出版"
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr "由 %(publisher)s 出版。"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "关闭"
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
-#: bookwyrm/templates/layout.html:97
-msgid "Directory"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:19
-msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "你可以在任何时候从你的<a href=\"%(path)s\">个人资料页面</a> 中设置或改变你的阅读目标"
-
-#: bookwyrm/templates/directory.html:31
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "遣散消息"
-
-#: bookwyrm/templates/directory.html:44
-#, fuzzy
-#| msgid "Show less"
-msgid "Show filters"
-msgstr "显示更少"
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-#, fuzzy
-#| msgid "User Activity"
-msgid "User type"
-msgstr "用户活动"
-
-#: bookwyrm/templates/directory.html:58
-msgid "BookWyrm users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
+#: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
 msgid "Community"
 msgstr "评论"
 
-#: bookwyrm/templates/directory.html:71
+#: bookwyrm/templates/directory/community_filter.html:8
 #, fuzzy
 #| msgid "Max uses"
 msgid "Local users"
 msgstr "最大使用次数"
 
-#: bookwyrm/templates/directory.html:75
+#: bookwyrm/templates/directory/community_filter.html:12
 #, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
 msgstr "跨站"
 
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:84
-#, fuzzy
-#| msgid "Suggest"
-msgid "Suggested"
-msgstr "推荐"
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
+#: bookwyrm/templates/directory/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
+#: bookwyrm/templates/directory/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "你可以在任何时候从你的<a href=\"%(path)s\">个人资料页面</a> 中设置或改变你的阅读目标"
 
-#: bookwyrm/templates/directory.html:94
-#, fuzzy
-#| msgid "Clear search"
-msgid "Clear filters"
-msgstr "清除搜索"
+#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "遣散消息"
 
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] "关注了你"
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] "你的书架"
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "推荐"
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "用户活动"
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -657,16 +684,6 @@ msgstr "Librarything key:"
 msgid "Goodreads key:"
 msgstr "Goodreads key:"
 
-#: bookwyrm/templates/editions.html:5
-#, python-format
-msgid "Editions of %(book_title)s"
-msgstr "%(book_title)s 的各版本"
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -735,18 +752,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr "关于 %(site_name)s"
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr "哎呀！"
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr "服务器错误"
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr "某些东西出错了！对不起啦。"
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -823,6 +828,8 @@ msgid "Updates"
 msgstr "更新"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "你的书目"
 
@@ -831,18 +838,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "现在这里还没有任何书目！尝试着从搜索某本书开始吧"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "To Read"
 msgstr "想读"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 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
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr "读过"
 
@@ -887,27 +894,33 @@ msgstr "%(username)s 在 %(year)s 的书目"
 msgid "Import Books"
 msgstr "导入书目"
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+#, fuzzy
+#| msgid "Data source"
+msgid "Data source:"
 msgstr "数据来源"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
 msgid "Include reviews"
 msgstr "纳入书评"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr "导入书评的隐私设定"
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr "导入"
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr "最近的导入"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr "无最近的导入"
 
@@ -964,12 +977,12 @@ msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr "作者"
 
@@ -1025,10 +1038,6 @@ msgstr "搜索"
 msgid "Main navigation menu"
 msgstr "主导航菜单"
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "你的书架"
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "动态"
@@ -1043,7 +1052,7 @@ msgid "Settings"
 msgstr "设置"
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1105,7 +1114,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr "BookWyrm 是开源软件。你可以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr "创建列表"
 
@@ -1169,7 +1178,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "任何人都可以推荐书目、主题让你批准"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr "开放"
 
@@ -1187,6 +1196,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr "移除"
 
@@ -1223,19 +1233,6 @@ msgstr "没有找到书目"
 msgid "Suggest"
 msgstr "推荐"
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr "你的列表"
-
-#: bookwyrm/templates/lists/lists.html:32
-#, python-format
-msgid "See all %(size)s lists"
-msgstr "查看所有 %(size)s 个列表"
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr "最近的列表"
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "登录"
@@ -1339,23 +1336,33 @@ msgstr "重新开启"
 msgid "Resolve"
 msgstr "已解决"
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Reports: %(server_name)s"
+msgstr "报告 %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 msgid "Reports"
 msgstr "报告"
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr "报告 %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:27
 msgid "Resolved"
 msgstr "已解决"
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr "未找到"
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
-msgstr "你请求的页面似乎并不存在！"
+#: bookwyrm/templates/moderation/reports.html:34
+#, fuzzy
+#| msgid "No books found"
+msgid "No reports found."
+msgstr "没有找到书目"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1587,51 +1594,133 @@ msgstr "管理"
 msgid "Manage Users"
 msgstr "管理用户"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "互联的服务器"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr "实例设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "站点设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "实例信息"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "图像"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "页脚内容"
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "注册"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to server list"
+msgstr "回到报告"
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+#, fuzzy
+#| msgid "Software"
+msgid "Software:"
+msgstr "软件"
+
+#: bookwyrm/templates/settings/federated_server.html:19
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "描述:"
+
+#: bookwyrm/templates/settings/federated_server.html:23
+#, fuzzy
+#| msgid "Status"
+msgid "Status:"
+msgstr "状态"
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "活动"
+
+#: bookwyrm/templates/settings/federated_server.html:33
+#, fuzzy
+#| msgid "Username:"
+msgid "Users:"
+msgstr "用户名:"
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+#, fuzzy
+#| msgid "Reports"
+msgid "Reports:"
+msgstr "报告"
+
+#: bookwyrm/templates/settings/federated_server.html:47
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by us:"
+msgstr "关注了你"
+
+#: bookwyrm/templates/settings/federated_server.html:53
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by them:"
+msgstr "关注了你"
+
+#: bookwyrm/templates/settings/federated_server.html:59
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by us:"
+msgstr "屏蔽的用户"
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "服务器名称"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+#, fuzzy
+#| msgid "Federated"
+msgid "Date federated"
+msgstr "跨站"
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr "软件"
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "状态"
 
@@ -1802,6 +1891,47 @@ msgstr "关注请求"
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "用户名:"
+
+#: bookwyrm/templates/settings/user_admin.html:24
+#, fuzzy
+#| msgid "Added:"
+msgid "Date Added"
+msgstr "添加了:"
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "移除"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "活动"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "屏蔽"
@@ -1862,7 +1992,7 @@ msgid "Review:"
 msgstr "书评"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr "评价"
 
@@ -1936,6 +2066,26 @@ msgstr "喜欢状态"
 msgid "Un-like status"
 msgstr "取消喜欢状态"
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "显示更少"
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "清除搜索"
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "关注"
@@ -2065,32 +2215,32 @@ msgstr "留下评价"
 msgid "Rate"
 msgstr "评价"
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr "进度更新:"
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr "已完成"
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr "显示所有更新"
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr "删除此进度更新"
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr "已开始"
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr "编辑阅读日期"
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "Delete these read dates"
 msgstr "删除这些阅读日期"
 
@@ -2150,45 +2300,11 @@ msgstr "由 %(author)s 所著"
 msgid "Import book"
 msgstr "导入书目"
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr "已出版"
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr "已上架"
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr "已开始"
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr "已完成"
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr "外部链接"
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr "OpenLibrary"
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr "此书架是空的。"
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr "删除书架"
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr "更换书架"
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
-msgstr "取下书架"
+#, fuzzy
+#| msgid "Your books"
+msgid "Move book"
+msgstr "你的书目"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2196,7 +2312,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "完成 \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 #, fuzzy
 #| msgid "Updates"
 msgid "Update progress"
@@ -2219,6 +2335,12 @@ msgstr "完成阅读"
 msgid "Want to read"
 msgstr "想要阅读"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Remove from %(name)s"
+msgstr "报告 %(username)s"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2287,6 +2409,18 @@ msgstr "更多选项"
 msgid "Switch to this edition"
 msgstr "切换到此版本"
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted asccending"
+msgstr "已开始阅读"
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted descending"
+msgstr "已开始阅读"
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr "移除标签"
@@ -2296,6 +2430,12 @@ msgstr "移除标签"
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "标有 \"%(tag.name)s\" 标签的书"
 
+#: bookwyrm/templates/user/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s's %(year)s Books"
+msgid "%(username)s's books"
+msgstr "%(username)s 在 %(year)s 的书目"
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2341,56 +2481,62 @@ msgstr "列表: %(username)s"
 msgid "Create list"
 msgstr "创建列表"
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr "你的书架"
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr "%(username)s: 书架"
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr "编辑书架"
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr "已上架"
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr "已开始"
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr "已完成"
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr "此书架是空的。"
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr "删除书架"
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "编辑个人资料"
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr "书架"
-
-#: bookwyrm/templates/user/user.html:31
-#, python-format
-msgid "See all %(size)s"
+#: bookwyrm/templates/user/user.html:33
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr "查看所有 %(size)s 本"
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr "查看所有 %(shelf_count)s 个书架"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
+msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "设定 %(year)s 的阅读目标"
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr "用户活动"
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr "RSS 流"
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr "还没有活动！"
 
@@ -2398,14 +2544,16 @@ msgstr "还没有活动！"
 msgid "Follow Requests"
 msgstr "关注请求"
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr "活动"
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "阅读目标"
 
+#: bookwyrm/templates/user/user_layout.html:68
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "书目"
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
@@ -2433,6 +2581,48 @@ msgstr "已经存在使用该用户名的用户。"
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#~ msgid "Your shelves"
+#~ msgstr "你的书架"
+
+#~ msgid "Your lists"
+#~ msgstr "你的列表"
+
+#, python-format
+#~ msgid "See all %(size)s lists"
+#~ msgstr "查看所有 %(size)s 个列表"
+
+#~ msgid "Recent Lists"
+#~ msgstr "最近的列表"
+
+#~ msgid "Published"
+#~ msgstr "已出版"
+
+#~ msgid "External links"
+#~ msgstr "外部链接"
+
+#~ msgid "OpenLibrary"
+#~ msgstr "OpenLibrary"
+
+#~ msgid "Change shelf"
+#~ msgstr "更换书架"
+
+#~ msgid "Unshelve"
+#~ msgstr "取下书架"
+
+#~ msgid "Your Shelves"
+#~ msgstr "你的书架"
+
+#, python-format
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s: 书架"
+
+#~ msgid "Shelves"
+#~ msgstr "书架"
+
+#, python-format
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "查看所有 %(shelf_count)s 个书架"
+
 #~ msgid "Send follow request"
 #~ msgstr "发送关注请求"