diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html
index 2fa8a5aea..f97a84814 100644
--- a/bookwyrm/templates/directory/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -1,7 +1,5 @@
{% extends 'layout.html' %}
{% load i18n %}
-{% load bookwyrm_tags %}
-{% load humanize %}
{% block title %}{% trans "Directory" %}{% endblock %}
@@ -41,59 +39,7 @@
{% for user in users %}
-
-
-
-
-
- {% if user.summary %}
- {{ user.summary | to_markdown | safe | truncatechars_html:40 }}
- {% else %} {% endif %}
-
-
-
-
+ {% include 'directory/user_card.html' %}
{% endfor %}
diff --git a/bookwyrm/templates/directory/user_card.html b/bookwyrm/templates/directory/user_card.html
new file mode 100644
index 000000000..8e7538c89
--- /dev/null
+++ b/bookwyrm/templates/directory/user_card.html
@@ -0,0 +1,57 @@
+{% load i18n %}
+{% load bookwyrm_tags %}
+{% load humanize %}
+
+
+
+
+
+
+ {% if user.summary %}
+ {{ user.summary | to_markdown | safe | truncatechars_html:40 }}
+ {% else %} {% endif %}
+
+
+
+
diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
new file mode 100644
index 000000000..53aadb63e
--- /dev/null
+++ b/bookwyrm/templates/search/book.html
@@ -0,0 +1,74 @@
+{% extends 'search/layout.html' %}
+{% load i18n %}
+
+{% block panel %}
+
+{% if results %}
+{% with results|first as local_results %}
+
+{% for result in local_results.results %}
+
+ {% include 'snippets/search_result_text.html' with result=result %}
+
+{% endfor %}
+
+{% endwith %}
+
+
+{% for result_set in results|slice:"1:" %}
+ {% if result_set.results %}
+
+ {% if not result_set.connector.local %}
+
+ {% endif %}
+
+
+
+
+ {% trans "Close" as button_text %}
+ {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier pressed=forloop.first %}
+
+
+
+ {% for result in result_set.results %}
+
+ {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
+
+ {% endfor %}
+
+
+
+
+ {% endif %}
+ {% endfor %}
+
+
+
+{% endif %}
+
+{% if not remote %}
+
+ {% if request.user.is_authenticated %}
+
+ {% trans "Load results from other catalogues" %}
+
+ {% else %}
+
+ {% trans "Log in to import or add books." %}
+
+ {% endif %}
+
+{% endif %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html
new file mode 100644
index 000000000..239586efa
--- /dev/null
+++ b/bookwyrm/templates/search/layout.html
@@ -0,0 +1,70 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Search" %}{% endblock %}
+
+{% block content %}
+
+
+ {% blocktrans %}Search{% endblocktrans %}
+
+
+
+
+
+{% if query %}
+
+
+
+
+
+ {% if not results %}
+
+ {% blocktrans %}No results found for "{{ query }}"{% endblocktrans %}
+
+ {% endif %}
+ {% block panel %}
+ {% endblock %}
+
+
+ {% include 'snippets/pagination.html' with page=results path=request.path %}
+
+
+{% endif %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/search/list.html b/bookwyrm/templates/search/list.html
new file mode 100644
index 000000000..d7e48f51c
--- /dev/null
+++ b/bookwyrm/templates/search/list.html
@@ -0,0 +1,7 @@
+{% extends 'search/layout.html' %}
+
+{% block panel %}
+
+{% include 'lists/list_items.html' with lists=results %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/search/user.html b/bookwyrm/templates/search/user.html
new file mode 100644
index 000000000..c6adc613a
--- /dev/null
+++ b/bookwyrm/templates/search/user.html
@@ -0,0 +1,14 @@
+{% extends 'search/layout.html' %}
+{% load bookwyrm_tags %}
+
+{% block panel %}
+
+
+{% for user in results %}
+
+ {% include 'directory/user_card.html' %}
+
+{% endfor %}
+
+
+{% endblock %}
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
deleted file mode 100644
index fdb77f728..000000000
--- a/bookwyrm/templates/search_results.html
+++ /dev/null
@@ -1,133 +0,0 @@
-{% extends 'layout.html' %}
-{% load i18n %}
-
-{% block title %}{% trans "Search Results" %}{% endblock %}
-
-{% block content %}
-{% with book_results|first as local_results %}
-
-
{% blocktrans %}Search Results for "{{ query }}"{% endblocktrans %}
-
-
-
-
-
{% trans "Matching Books" %}
-
- {% if not local_results.results %}
- {% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}
- {% if not user.is_authenticated %}
-
- {% trans "Log in to import or add books." %}
-
- {% endif %}
- {% else %}
-
- {% for result in local_results.results %}
-
- {% include 'snippets/search_result_text.html' with result=result %}
-
- {% endfor %}
-
- {% endif %}
-
-
- {% if request.user.is_authenticated %}
- {% if book_results|slice:":1" and local_results.results %}
-
-
- {% trans "Didn't find what you were looking for?" %}
-
- {% trans "Show results from other catalogues" as button_text %}
- {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results" %}
-
- {% if local_results.results %}
- {% trans "Hide results from other catalogues" as button_text %}
- {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results" %}
- {% endif %}
-
- {% endif %}
-
-
- {% for result_set in book_results|slice:"1:" %}
- {% if result_set.results %}
-
- {% if not result_set.connector.local %}
-
- {% endif %}
-
-
-
-
- {% trans "Close" as button_text %}
- {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier pressed=forloop.first %}
-
-
-
- {% for result in result_set.results %}
-
- {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
-
- {% endfor %}
-
-
-
-
- {% endif %}
- {% endfor %}
-
-
-
- {% endif %}
-
-
- {% if request.user.is_authenticated %}
-
- {% trans "Matching Users" %}
- {% if not user_results %}
- {% blocktrans %}No users found for "{{ query }}"{% endblocktrans %}
- {% endif %}
-
-
- {% endif %}
-
- {% trans "Lists" %}
- {% if not list_results %}
- {% blocktrans %}No lists found for "{{ query }}"{% endblocktrans %}
- {% endif %}
- {% for result in list_results %}
-
- {% endfor %}
-
-
-
-{% endwith %}
-{% endblock %}
diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 777275222..b2f3bbcc3 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -2,6 +2,7 @@
import json
from unittest.mock import patch
+from django.contrib.auth.models import AnonymousUser
from django.http import JsonResponse
from django.template.response import TemplateResponse
from django.test import TestCase
@@ -12,7 +13,7 @@ from bookwyrm.connectors import abstract_connector
from bookwyrm.settings import DOMAIN
-class ShelfViews(TestCase):
+class Views(TestCase):
"""tag views"""
def setUp(self):
@@ -52,7 +53,7 @@ class ShelfViews(TestCase):
self.assertEqual(data[0]["title"], "Test Book")
self.assertEqual(data[0]["key"], "https://%s/book/%d" % (DOMAIN, self.book.id))
- def test_search_html_response(self):
+ def test_search_books(self):
"""searches remote connectors"""
view = views.Search.as_view()
@@ -92,7 +93,7 @@ class ShelfViews(TestCase):
connector=connector,
)
- request = self.factory.get("", {"q": "Test Book"})
+ request = self.factory.get("", {"q": "Test Book", "remote": True})
request.user = self.local_user
with patch("bookwyrm.views.search.is_api_request") as is_api:
is_api.return_value = False
@@ -101,19 +102,44 @@ class ShelfViews(TestCase):
response = view(request)
self.assertIsInstance(response, TemplateResponse)
response.render()
- self.assertEqual(
- response.context_data["book_results"][0].title, "Gideon the Ninth"
- )
+ self.assertEqual(response.context_data["results"][0].title, "Gideon the Ninth")
- def test_search_html_response_users(self):
+ def test_search_users(self):
"""searches remote connectors"""
view = views.Search.as_view()
- request = self.factory.get("", {"q": "mouse"})
+ request = self.factory.get("", {"q": "mouse", "type": "user"})
request.user = self.local_user
- with patch("bookwyrm.views.search.is_api_request") as is_api:
- is_api.return_value = False
- with patch("bookwyrm.connectors.connector_manager.search"):
- response = view(request)
+ response = view(request)
+
self.assertIsInstance(response, TemplateResponse)
response.render()
- self.assertEqual(response.context_data["user_results"][0], self.local_user)
+ self.assertEqual(response.context_data["results"][0], self.local_user)
+
+ def test_search_users_logged_out(self):
+ """searches remote connectors"""
+ view = views.Search.as_view()
+ request = self.factory.get("", {"q": "mouse", "type": "user"})
+
+ anonymous_user = AnonymousUser
+ anonymous_user.is_authenticated = False
+ request.user = anonymous_user
+
+ response = view(request)
+
+ response.render()
+ self.assertEqual(response.context_data["results"].object_list.count(), 0)
+
+ def test_search_lists(self):
+ """searches remote connectors"""
+ with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+ booklist = models.List.objects.create(
+ user=self.local_user, name="test list"
+ )
+ view = views.Search.as_view()
+ request = self.factory.get("", {"q": "test", "type": "list"})
+ request.user = self.local_user
+ response = view(request)
+
+ self.assertIsInstance(response, TemplateResponse)
+ response.render()
+ self.assertEqual(response.context_data["results"][0], booklist)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 99e51ff3c..5412378e6 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -163,7 +163,7 @@ urlpatterns = [
name="direct-messages-user",
),
# search
- re_path(r"^search/?$", views.Search.as_view()),
+ re_path(r"^search/?$", views.Search.as_view(), name="search"),
# imports
re_path(r"^import/?$", views.Import.as_view()),
re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view()),
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index bd5ac3c74..4b9100fb7 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -2,6 +2,7 @@
import re
from django.contrib.postgres.search import TrigramSimilarity
+from django.core.paginator import Paginator
from django.db.models.functions import Greatest
from django.http import JsonResponse
from django.template.response import TemplateResponse
@@ -9,6 +10,7 @@ from django.views import View
from bookwyrm import models
from bookwyrm.connectors import connector_manager
+from bookwyrm.settings import PAGE_LENGTH
from bookwyrm.utils import regex
from .helpers import is_api_request, privacy_filter
from .helpers import handle_remote_webfinger
@@ -22,6 +24,10 @@ class Search(View):
"""that search bar up top"""
query = request.GET.get("q")
min_confidence = request.GET.get("min_confidence", 0.1)
+ search_type = request.GET.get("type")
+ search_remote = (
+ request.GET.get("remote", False) and request.user.is_authenticated
+ )
if is_api_request(request):
# only return local book results via json so we don't cascade
@@ -30,48 +36,86 @@ class Search(View):
)
return JsonResponse([r.json() for r in book_results], safe=False)
- data = {"query": query or ""}
+ if not search_type:
+ search_type = "user" if "@" in query else "book"
- # use webfinger for mastodon style account@domain.com username
- if query and re.match(regex.full_username, query):
- handle_remote_webfinger(query)
+ endpoints = {
+ "book": book_search,
+ "user": user_search,
+ "list": list_search,
+ }
+ if not search_type in endpoints:
+ search_type = "book"
- # do a user search
- if request.user.is_authenticated:
- data["user_results"] = (
- models.User.viewer_aware_objects(request.user)
- .annotate(
- similarity=Greatest(
- TrigramSimilarity("username", query),
- TrigramSimilarity("localname", query),
- )
- )
- .filter(
- similarity__gt=0.5,
- )
- .order_by("-similarity")[:10]
+ data = {
+ "query": query or "",
+ "type": search_type,
+ "remote": search_remote,
+ }
+ if query:
+ results = endpoints[search_type](
+ query, request.user, min_confidence, search_remote
)
+ paginated = Paginator(results, PAGE_LENGTH).get_page(
+ request.GET.get("page")
+ )
+ data["results"] = paginated
- # any relevent lists?
- data["list_results"] = (
- privacy_filter(
- request.user,
- models.List.objects,
- privacy_levels=["public", "followers"],
+ return TemplateResponse(request, "search/{:s}.html".format(search_type), data)
+
+
+def book_search(query, _, min_confidence, search_remote=False):
+ """the real business is elsewhere"""
+ if search_remote:
+ return connector_manager.search(query, min_confidence=min_confidence)
+ results = connector_manager.local_search(query, min_confidence=min_confidence)
+ if not results:
+ return None
+ return [{"results": results}]
+
+
+def user_search(query, viewer, *_):
+ """cool kids members only user search"""
+ # logged out viewers can't search users
+ if not viewer.is_authenticated:
+ return models.User.objects.none()
+
+ # use webfinger for mastodon style account@domain.com username to load the user if
+ # they don't exist locally (handle_remote_webfinger will check the db)
+ if re.match(regex.full_username, query):
+ handle_remote_webfinger(query)
+
+ return (
+ models.User.viewer_aware_objects(viewer)
+ .annotate(
+ similarity=Greatest(
+ TrigramSimilarity("username", query),
+ TrigramSimilarity("localname", query),
)
- .annotate(
- similarity=Greatest(
- TrigramSimilarity("name", query),
- TrigramSimilarity("description", query),
- )
- )
- .filter(
- similarity__gt=0.1,
- )
- .order_by("-similarity")[:10]
)
-
- data["book_results"] = connector_manager.search(
- query, min_confidence=min_confidence
+ .filter(
+ similarity__gt=0.5,
)
- return TemplateResponse(request, "search_results.html", data)
+ .order_by("-similarity")[:10]
+ )
+
+
+def list_search(query, viewer, *_):
+ """any relevent lists?"""
+ return (
+ privacy_filter(
+ viewer,
+ models.List.objects,
+ privacy_levels=["public", "followers"],
+ )
+ .annotate(
+ similarity=Greatest(
+ TrigramSimilarity("name", query),
+ TrigramSimilarity("description", query),
+ )
+ )
+ .filter(
+ similarity__gt=0.1,
+ )
+ .order_by("-similarity")[:10]
+ )
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index d7ad8724e..4c5813d5b 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-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\n"
"PO-Revision-Date: 2021-03-02 17:19-0800\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: English \n"
@@ -62,11 +62,12 @@ msgid "Book Title"
msgstr "Titel"
#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
msgid "Rating"
msgstr ""
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
msgid "Sort By"
msgstr ""
@@ -92,7 +93,7 @@ msgstr "%(value)s ist keine gültige remote_id"
msgid "%(value)s is not a valid username"
msgstr "%(value)s ist kein gültiger Username"
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
msgid "username"
msgstr "Username"
@@ -154,8 +155,8 @@ msgid "Books by %(name)s"
msgstr "Bücher von %(name)s"
#: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
msgid "by"
msgstr "von"
@@ -163,52 +164,52 @@ msgstr "von"
msgid "Edit Book"
msgstr "Buch editieren"
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
#: bookwyrm/templates/book/cover_modal.html:5
msgid "Add cover"
msgstr "Cover hinzufügen"
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
#, fuzzy
#| msgid "Failed to load"
msgid "Failed to load cover"
msgstr "Laden fehlgeschlagen"
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
msgid "View on OpenLibrary"
msgstr "In OpenLibrary ansehen"
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
#, fuzzy
#| msgid "View on OpenLibrary"
msgid "View on Inventaire"
msgstr "In OpenLibrary ansehen"
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
#, 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:117
+#: bookwyrm/templates/book/book.html:116
msgid "Add Description"
msgstr "Beschreibung hinzufügen"
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
#: bookwyrm/templates/book/edit_book.html:107
#: bookwyrm/templates/lists/form.html:12
msgid "Description:"
msgstr "Beschreibung:"
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:70
#: bookwyrm/templates/settings/edit_server.html:68
#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
#: 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
@@ -216,15 +217,15 @@ msgstr "Beschreibung:"
msgid "Save"
msgstr "Speichern"
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
#: bookwyrm/templates/edit_author.html:79
#: bookwyrm/templates/moderation/report_modal.html:34
#: bookwyrm/templates/settings/federated_server.html:94
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
#: 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
@@ -232,19 +233,19 @@ msgstr "Speichern"
msgid "Cancel"
msgstr "Abbrechen"
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
#, fuzzy, python-format
#| msgid "%(title)s by "
msgid "%(count)s editions "
msgstr "%(title)s von"
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
#, fuzzy, python-format
#| msgid "Direct Messages with %(username)s "
msgid "This edition is on your %(shelf_name)s shelf."
msgstr "Direktnachrichten mit %(username)s "
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
#, fuzzy, python-format
#| msgid ""
#| " added %(book_title)s to your list "
@@ -256,100 +257,101 @@ msgstr ""
"hat %(book_title)s zu deiner Liste "
"\"%(list_name)s \" Hinzugefügt"
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
msgid "Your reading activity"
msgstr "Deine Leseaktivität"
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
msgid "Add read dates"
msgstr "Lesedaten hinzufügen"
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
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:175
+#: bookwyrm/templates/book/book.html:177
msgid "Create"
msgstr "Erstellen"
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr "Themen"
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr "Orte"
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr "Listen"
-
-#: bookwyrm/templates/book/book.html:231
-#, fuzzy
-#| msgid "Go to list"
-msgid "Add to list"
-msgstr "Zur Liste"
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
#, fuzzy
#| msgid "Review"
msgid "Reviews"
msgstr "Bewerten"
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
#, fuzzy
#| msgid "Your shelves"
msgid "Your reviews"
msgstr "Deine Regale"
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
#, fuzzy
#| msgid "Your Account"
msgid "Your comments"
msgstr "Dein Account"
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
#, fuzzy
#| msgid "Your books"
msgid "Your quotes"
msgstr "Deine Bücher"
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
msgid "rated it"
msgstr "bewertet"
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr "Themen"
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr "Orte"
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr "Listen"
+
+#: bookwyrm/templates/book/book.html:310
+#, fuzzy
+#| msgid "Go to list"
+msgid "Add to list"
+msgstr "Zur Liste"
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr "Hinzufügen"
+
#: bookwyrm/templates/book/book_identifiers.html:8
msgid "ISBN:"
msgstr ""
#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
msgid "OCLC Number:"
msgstr "OCLC Nummer:"
#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
msgid "ASIN:"
msgstr ""
#: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
#, fuzzy
#| msgid "Add cover"
msgid "Upload cover:"
msgstr "Cover hinzufügen"
#: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
msgid "Load cover from url:"
msgstr "Cover von URL laden:"
@@ -486,36 +488,36 @@ msgid "John Doe, Jane Smith"
msgstr ""
#: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
msgid "Cover"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
msgid "Physical Properties"
msgstr "Physikalische Eigenschaften"
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
#: bookwyrm/templates/book/format_filter.html:5
msgid "Format:"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
msgid "Pages:"
msgstr "Seiten:"
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
msgid "Book Identifiers"
msgstr "Buchidentifikatoren"
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
msgid "ISBN 13:"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
msgid "ISBN 10:"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
#: bookwyrm/templates/edit_author.html:59
msgid "Openlibrary key:"
msgstr ""
@@ -581,7 +583,7 @@ msgstr "Veröffentlicht von %(publisher)s."
#: bookwyrm/templates/feed/feed_layout.html:70
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
msgid "Close"
msgstr "Schließen"
@@ -609,17 +611,17 @@ msgstr "Maximale Benutzungen"
msgid "Federated community"
msgstr "Föderiert"
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
#: bookwyrm/templates/layout.html:93
msgid "Directory"
msgstr ""
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
msgid "Make your profile discoverable to other BookWyrm users."
msgstr ""
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
#, fuzzy, python-format
#| msgid ""
#| "You can set or change your reading goal any time from your Profilseite setzen oder ändern."
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
#: bookwyrm/templates/snippets/goal_card.html:22
msgid "Dismiss message"
msgstr "Nachricht verwerfen"
-#: bookwyrm/templates/directory/directory.html:71
-#, fuzzy
-#| msgid "followed you"
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] "folgt dir"
-msgstr[1] "folgt dir"
-
-#: bookwyrm/templates/directory/directory.html:78
-#, fuzzy
-#| msgid "Your shelves"
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] "Deine Regale"
-msgstr[1] "Deine Regale"
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr ""
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr ""
-
#: bookwyrm/templates/directory/sort_filter.html:5
msgid "Order by"
msgstr ""
@@ -674,6 +652,30 @@ msgstr "Vorschlagen"
msgid "Recently active"
msgstr ""
+#: bookwyrm/templates/directory/user_card.html:32
+#, fuzzy
+#| msgid "followed you"
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "folgt dir"
+msgstr[1] "folgt dir"
+
+#: bookwyrm/templates/directory/user_card.html:39
+#, fuzzy
+#| msgid "Your shelves"
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "Deine Regale"
+msgstr[1] "Deine Regale"
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr ""
+
#: bookwyrm/templates/directory/user_type_filter.html:5
#, fuzzy
#| msgid "User Activity"
@@ -765,8 +767,8 @@ msgid "Edit Author:"
msgstr "Autor*in editieren"
#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
msgid "Name:"
msgstr ""
@@ -939,7 +941,7 @@ msgstr ""
#: bookwyrm/templates/feed/feed_layout.html:11
#: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
msgid "Your books"
msgstr "Deine Bücher"
@@ -950,14 +952,14 @@ msgstr ""
"Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
#, fuzzy
#| msgid "Read"
msgid "To Read"
msgstr "Auf der Leseliste"
#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
#, fuzzy
#| msgid "Start reading"
msgid "Currently Reading"
@@ -965,7 +967,7 @@ msgstr "Gerade lesend"
#: bookwyrm/templates/feed/feed_layout.html:26
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Read"
msgstr "Gelesen"
@@ -1002,13 +1004,12 @@ msgid "What are you reading?"
msgstr "Zu lesen angefangen"
#: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
msgid "Search for a book"
msgstr "Nach einem Buch suchen"
#: bookwyrm/templates/get_started/books.html:11
#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
#, python-format
msgid "No books found for \"%(query)s\""
msgstr "Keine Bücher für \"%(query)s\" gefunden"
@@ -1023,28 +1024,30 @@ msgstr ""
#: bookwyrm/templates/get_started/users.html:18
#: bookwyrm/templates/get_started/users.html:19
#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
msgid "Search"
msgstr "Suche"
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
#, fuzzy
#| msgid "Suggest Books"
msgid "Suggested Books"
msgstr "Bücher vorschlagen"
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
#, fuzzy, python-format
#| msgid "About %(site_name)s"
msgid "Popular on %(site_name)s"
msgstr "Über %(site_name)s"
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
msgid "No books found"
msgstr "Keine Bücher gefunden"
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
#: bookwyrm/templates/get_started/profile.html:54
msgid "Save & continue"
msgstr ""
@@ -1130,7 +1133,6 @@ msgid "Search for a user"
msgstr "Suche nach Buch oder Benutzer*in"
#: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
#, python-format
msgid "No users found for \"%(query)s\""
msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
@@ -1256,18 +1258,19 @@ msgid "Successfully imported"
msgstr "Erfolgreich importiert"
#: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
msgid "Book"
msgstr "Buch"
#: bookwyrm/templates/import_status.html:115
#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
msgid "Title"
msgstr "Titel"
#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
msgid "Author"
msgstr "Autor*in"
@@ -1289,18 +1292,15 @@ msgid "Sorry! This invite code is no longer valid."
msgstr "Sorry! Dieser Einladecode ist mehr gültig."
#: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
msgid "Search Results"
msgstr "Suchergebnisse"
#: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
#, python-format
msgid "Search Results for \"%(query)s\""
msgstr "Suchergebnisse für \"%(query)s\""
#: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
msgid "Matching Books"
msgstr "Passende Bücher"
@@ -1342,38 +1342,44 @@ msgstr "Abmelden"
msgid "Notifications"
msgstr "Benachrichtigungen"
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
#: bookwyrm/templates/login.html:17
#: bookwyrm/templates/snippets/register_form.html:4
msgid "Username:"
msgstr ""
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
msgid "password"
msgstr "Passwort"
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
msgid "Forgot your password?"
msgstr "Passwort vergessen?"
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
#: bookwyrm/templates/login.html:33
msgid "Log in"
msgstr "Anmelden"
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
msgid "Join"
msgstr ""
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
msgid "About this server"
msgstr "Über diesen Server"
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
msgid "Contact site admin"
msgstr "Admin kontaktieren"
#: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "List curation:"
+msgid "Documentation"
+msgstr "Listenkuratierung:"
+
+#: bookwyrm/templates/layout.html:213
#, python-format
msgid ""
"Support %(site_name)s on "
@@ -1382,7 +1388,7 @@ msgstr ""
"%(site_name)s auf "
"%(support_title)s unterstützen"
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
msgid ""
"BookWyrm is open source software. You can contribute or report issues on GitHub ."
@@ -1407,27 +1413,27 @@ msgstr "Direktnachrichten mit %(username)s "
msgid "Created by %(username)s "
msgstr "Direktnachrichten mit %(username)s "
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
msgid "Pending Books"
msgstr "Unbestätigte Bücher"
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
msgid "Go to list"
msgstr "Zur Liste"
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
msgid "You're all set!"
msgstr "Du bist soweit!"
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
msgid "Suggested by"
msgstr "Vorgeschlagen von"
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
msgid "Approve"
msgstr "Bestätigen"
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
msgid "Discard"
msgstr "Ablehnen"
@@ -1479,63 +1485,63 @@ msgstr "Alle können Bücher hinzufügen"
msgid "This list is currently empty"
msgstr "Diese Liste ist momentan leer"
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
#, fuzzy, python-format
#| msgid "Direct Messages with %(username)s "
msgid "Added by %(username)s "
msgstr "Direktnachrichten mit %(username)s "
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
#, fuzzy
#| msgid "Started"
msgid "Set"
msgstr "Gestartet"
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
#, fuzzy
#| msgid "List curation:"
msgid "List position"
msgstr "Listenkuratierung:"
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
#: bookwyrm/templates/snippets/shelf_selector.html:26
msgid "Remove"
msgstr "Entfernen"
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
#, fuzzy
#| msgid "Your Lists"
msgid "Sort List"
msgstr "Deine Listen"
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
#, fuzzy
#| msgid "List curation:"
msgid "Direction"
msgstr "Listenkuratierung:"
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Add Books"
msgstr "Bücher hinzufügen"
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Suggest Books"
msgstr "Bücher vorschlagen"
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
msgid "search"
msgstr "suchen"
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
msgid "Clear search"
msgstr "Suche leeren"
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
#, python-format
msgid "No books found matching the query \"%(query)s\""
msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
msgid "Suggest"
msgstr "Vorschlagen"
@@ -1909,35 +1915,54 @@ msgstr "Profil"
msgid "Relationships"
msgstr "Beziehungen"
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr "Nicht gefunden, wonach du gesucht hast?"
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr "Ergebnisse aus anderen Katalogen zeigen"
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr "Ergebnisse aus anderen Katalogen ausblenden"
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
#, fuzzy
#| msgid "Show more"
msgid "Show"
msgstr "Mehr anzeigen"
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
-msgstr "Passende Nutzer*innen"
+#: bookwyrm/templates/search/book.html:64
+#, fuzzy
+#| msgid "Show results from other catalogues"
+msgid "Load results from other catalogues"
+msgstr "Ergebnisse aus anderen Katalogen zeigen"
-#: bookwyrm/templates/search_results.html:117
-#, python-format
-msgid "No lists found for \"%(query)s\""
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search query"
+msgstr "Suche nach Buch oder Benutzer*in"
+
+#: bookwyrm/templates/search/layout.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search type"
+msgstr "Suche"
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Buch"
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:58
+#, fuzzy, python-format
+#| msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
msgstr "Keine Liste für \"%(query)s\" gefunden"
#: bookwyrm/templates/settings/admin_layout.html:4
@@ -1948,12 +1973,6 @@ msgstr ""
msgid "Manage Users"
msgstr "Nutzer*innen verwalten"
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr ""
-
#: bookwyrm/templates/settings/admin_layout.html:39
#: bookwyrm/templates/settings/federation.html:3
#: bookwyrm/templates/settings/federation.html:5
@@ -1986,7 +2005,7 @@ msgid "Footer Content"
msgstr "Inhalt des Footers"
#: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
msgid "Registration"
msgstr "Registrierung"
@@ -2061,7 +2080,7 @@ msgid "Details"
msgstr ""
#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
msgid "Activity"
msgstr "Aktivität"
@@ -2341,22 +2360,25 @@ msgstr "Unterstützungstitel"
msgid "Admin email:"
msgstr ""
-#: bookwyrm/templates/settings/site.html:79
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
msgid "Allow registration:"
msgstr "Registrierungen erlauben"
-#: bookwyrm/templates/settings/site.html:83
+#: bookwyrm/templates/settings/site.html:87
#, fuzzy
#| msgid "Follow Requests"
msgid "Allow invite requests:"
msgstr "Folgeanfragen"
-#: bookwyrm/templates/settings/site.html:87
+#: bookwyrm/templates/settings/site.html:91
msgid "Registration closed text:"
msgstr "Registrierungen geschlossen text"
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
#, fuzzy
#| msgid "Add cover"
msgid "No cover"
@@ -2659,7 +2681,8 @@ msgid "Post privacy"
msgstr ""
#: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
msgid "Followers"
msgstr "Folgende"
@@ -2687,16 +2710,16 @@ msgstr "Zeige alle Updates"
msgid "Delete this progress update"
msgstr "Dieses Fortschrittsupdate löschen"
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
msgid "started"
msgstr "Angefangen"
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
msgid "Edit read dates"
msgstr "Lesedaten bearbeiten"
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
msgid "Delete these read dates"
msgstr "Diese Lesedaten löschen"
@@ -2745,7 +2768,7 @@ msgstr "kommentierte"
msgid "quoted"
msgstr "zitierte"
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
msgid "Import book"
msgstr "Buch importieren"
@@ -2800,17 +2823,17 @@ msgstr "\"%(book_title)s \" beginnen"
msgid "Want to Read \"%(book_title)s \""
msgstr "\"%(book_title)s \" auf Leseliste setzen"
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
#: bookwyrm/templates/snippets/trimmed_text.html:14
msgid "Show more"
msgstr "Mehr anzeigen"
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
#: bookwyrm/templates/snippets/trimmed_text.html:29
msgid "Show less"
msgstr "Weniger anzeigen"
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
msgid "Open image in new window"
msgstr "Bild in neuem Fenster öffnen"
@@ -2878,44 +2901,17 @@ msgstr "Zu lesen angefangen"
msgid "Sorted descending"
msgstr "Zu lesen angefangen"
-#: 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"
-msgstr "Regal erstellen"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr "Regal bearbeiten"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr "Regal aktualisieren"
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Benutzerprofil"
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
-msgstr "niemand folgt %(username)s "
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
+msgstr "Folgeanfragen"
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr "Folgend"
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr "%(username)s folgt niemandem"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
+msgstr "Leseziel"
#: bookwyrm/templates/user/lists.html:11
#, python-format
@@ -2926,37 +2922,74 @@ msgstr "Listen: %(username)s"
msgid "Create list"
msgstr "Liste Erstellen"
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "niemand folgt %(username)s "
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr "Folgend"
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s folgt niemandem"
+
+#: bookwyrm/templates/user/shelf/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/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr "Regal erstellen"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "Regal bearbeiten"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "Regal aktualisieren"
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
#, fuzzy
#| msgid "books"
msgid "All books"
msgstr "Bücher"
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
msgid "Create shelf"
msgstr "Regal erstellen"
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
msgid "Edit shelf"
msgstr "Regal bearbeiten"
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
msgid "Shelved"
msgstr "Ins Regal gestellt"
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
msgid "Started"
msgstr "Gestartet"
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
msgid "Finished"
msgstr "Abgeschlossen"
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
msgid "This shelf is empty."
msgstr "Dieses Regal ist leer."
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
msgid "Delete shelf"
msgstr "Regal löschen"
@@ -2974,54 +3007,43 @@ msgstr "Alle %(size)s anzeigen"
msgid "View all books"
msgstr ""
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr "Leseziel für %(year)s setzen"
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
msgid "User Activity"
msgstr "Nutzer*innenaktivität"
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
msgid "RSS feed"
msgstr ""
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
msgid "No activities yet!"
msgstr "Noch keine Aktivitäten!"
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-msgstr "Folgeanfragen"
-
-#: 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
+#: bookwyrm/templates/user/user_preview.html:14
#, python-format
msgid "Joined %(date)s"
msgstr "Beigetreten %(date)s"
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
#, python-format
msgid "%(counter)s follower"
msgid_plural "%(counter)s followers"
msgstr[0] "%(counter)s Folgende*r"
msgstr[1] "%(counter)s Folgende"
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
#, python-format
msgid "%(counter)s following"
msgstr "Folgt %(counter)s"
+#: bookwyrm/templates/user/user_preview.html:25
+#, fuzzy, python-format
+#| msgid "followed you"
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] "folgt dir"
+msgstr[1] "folgt dir"
+
#: bookwyrm/templates/user_admin/user.html:11
#, fuzzy
#| msgid "Back to reports"
@@ -4507,6 +4529,19 @@ msgctxt "stick"
msgid "club"
msgstr ""
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "Nicht gefunden, wonach du gesucht hast?"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "Ergebnisse aus anderen Katalogen ausblenden"
+
+#~ msgid "Matching Users"
+#~ msgstr "Passende Nutzer*innen"
+
+#, python-format
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "Leseziel für %(year)s setzen"
+
#, python-format
#~ msgid "by %(author)s"
#~ msgstr "von %(author)s"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index c3df47ae1..c886a7428 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-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\n"
"PO-Revision-Date: 2021-02-28 17:19-0800\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: English \n"
@@ -56,11 +56,12 @@ msgid "Book Title"
msgstr ""
#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
msgid "Rating"
msgstr ""
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
msgid "Sort By"
msgstr ""
@@ -82,7 +83,7 @@ msgstr ""
msgid "%(value)s is not a valid username"
msgstr ""
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
msgid "username"
msgstr ""
@@ -144,8 +145,8 @@ msgid "Books by %(name)s"
msgstr ""
#: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
msgid "by"
msgstr ""
@@ -153,48 +154,48 @@ msgstr ""
msgid "Edit Book"
msgstr ""
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
#: bookwyrm/templates/book/cover_modal.html:5
msgid "Add cover"
msgstr ""
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
msgid "Failed to load cover"
msgstr ""
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
msgid "View on OpenLibrary"
msgstr ""
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
msgid "View on Inventaire"
msgstr ""
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
#, python-format
msgid "(%(review_count)s review)"
msgid_plural "(%(review_count)s reviews)"
msgstr[0] ""
msgstr[1] ""
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:116
msgid "Add Description"
msgstr ""
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
#: bookwyrm/templates/book/edit_book.html:107
#: bookwyrm/templates/lists/form.html:12
msgid "Description:"
msgstr ""
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:70
#: bookwyrm/templates/settings/edit_server.html:68
#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
#: 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
@@ -202,15 +203,15 @@ msgstr ""
msgid "Save"
msgstr ""
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
#: bookwyrm/templates/edit_author.html:79
#: bookwyrm/templates/moderation/report_modal.html:34
#: bookwyrm/templates/settings/federated_server.html:94
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
#: 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
@@ -218,105 +219,106 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
#, python-format
msgid "%(count)s editions "
msgstr ""
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
#, python-format
msgid "This edition is on your %(shelf_name)s shelf."
msgstr ""
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
#, python-format
msgid ""
"A different edition of this book is on your %(shelf_name)s shelf."
msgstr ""
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
msgid "Your reading activity"
msgstr ""
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
msgid "Add read dates"
msgstr ""
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
msgid "You don't have any reading activity for this book."
msgstr ""
-#: bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:177
msgid "Create"
msgstr ""
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:231
-msgid "Add to list"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
msgid "Reviews"
msgstr ""
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
msgid "Your reviews"
msgstr ""
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
msgid "Your comments"
msgstr ""
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
msgid "Your quotes"
msgstr ""
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
msgid "rated it"
msgstr ""
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:310
+msgid "Add to list"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr ""
+
#: bookwyrm/templates/book/book_identifiers.html:8
msgid "ISBN:"
msgstr ""
#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
msgid "OCLC Number:"
msgstr ""
#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
msgid "ASIN:"
msgstr ""
#: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
msgid "Upload cover:"
msgstr ""
#: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
msgid "Load cover from url:"
msgstr ""
@@ -442,36 +444,36 @@ msgid "John Doe, Jane Smith"
msgstr ""
#: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
msgid "Cover"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
msgid "Physical Properties"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
#: bookwyrm/templates/book/format_filter.html:5
msgid "Format:"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
msgid "Pages:"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
msgid "Book Identifiers"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
msgid "ISBN 13:"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
msgid "ISBN 10:"
msgstr ""
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
#: bookwyrm/templates/edit_author.html:59
msgid "Openlibrary key:"
msgstr ""
@@ -535,7 +537,7 @@ msgstr ""
#: bookwyrm/templates/feed/feed_layout.html:70
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
msgid "Close"
msgstr ""
@@ -555,48 +557,28 @@ msgstr ""
msgid "Federated community"
msgstr ""
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
#: bookwyrm/templates/layout.html:93
msgid "Directory"
msgstr ""
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
msgid "Make your profile discoverable to other BookWyrm users."
msgstr ""
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
#, python-format
msgid ""
"You can opt-out at any time in your profile settings."
"a>"
msgstr ""
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
#: bookwyrm/templates/snippets/goal_card.html:22
msgid "Dismiss message"
msgstr ""
-#: bookwyrm/templates/directory/directory.html:71
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/directory/directory.html:78
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr ""
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr ""
-
#: bookwyrm/templates/directory/sort_filter.html:5
msgid "Order by"
msgstr ""
@@ -609,6 +591,26 @@ msgstr ""
msgid "Recently active"
msgstr ""
+#: bookwyrm/templates/directory/user_card.html:32
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/directory/user_card.html:39
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr ""
+
#: bookwyrm/templates/directory/user_type_filter.html:5
msgid "User type"
msgstr ""
@@ -696,8 +698,8 @@ msgid "Edit Author:"
msgstr ""
#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
msgid "Name:"
msgstr ""
@@ -864,7 +866,7 @@ msgstr ""
#: bookwyrm/templates/feed/feed_layout.html:11
#: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
msgid "Your books"
msgstr ""
@@ -874,18 +876,18 @@ msgid ""
msgstr ""
#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "To Read"
msgstr ""
#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Currently Reading"
msgstr ""
#: bookwyrm/templates/feed/feed_layout.html:26
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Read"
msgstr ""
@@ -919,13 +921,12 @@ msgid "What are you reading?"
msgstr ""
#: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
msgid "Search for a book"
msgstr ""
#: bookwyrm/templates/get_started/books.html:11
#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
#, python-format
msgid "No books found for \"%(query)s\""
msgstr ""
@@ -940,25 +941,27 @@ msgstr ""
#: bookwyrm/templates/get_started/users.html:18
#: bookwyrm/templates/get_started/users.html:19
#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
msgid "Search"
msgstr ""
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
msgid "Suggested Books"
msgstr ""
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
#, python-format
msgid "Popular on %(site_name)s"
msgstr ""
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
msgid "No books found"
msgstr ""
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
#: bookwyrm/templates/get_started/profile.html:54
msgid "Save & continue"
msgstr ""
@@ -1033,7 +1036,6 @@ msgid "Search for a user"
msgstr ""
#: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
#, python-format
msgid "No users found for \"%(query)s\""
msgstr ""
@@ -1153,18 +1155,19 @@ msgid "Successfully imported"
msgstr ""
#: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
msgid "Book"
msgstr ""
#: bookwyrm/templates/import_status.html:115
#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
msgid "Title"
msgstr ""
#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
msgid "Author"
msgstr ""
@@ -1186,18 +1189,15 @@ msgid "Sorry! This invite code is no longer valid."
msgstr ""
#: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
msgid "Search Results"
msgstr ""
#: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
#, python-format
msgid "Search Results for \"%(query)s\""
msgstr ""
#: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
msgid "Matching Books"
msgstr ""
@@ -1239,45 +1239,49 @@ msgstr ""
msgid "Notifications"
msgstr ""
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
#: bookwyrm/templates/login.html:17
#: bookwyrm/templates/snippets/register_form.html:4
msgid "Username:"
msgstr ""
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
msgid "password"
msgstr ""
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
msgid "Forgot your password?"
msgstr ""
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
#: bookwyrm/templates/login.html:33
msgid "Log in"
msgstr ""
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
msgid "Join"
msgstr ""
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
msgid "About this server"
msgstr ""
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
msgid "Contact site admin"
msgstr ""
#: bookwyrm/templates/layout.html:206
+msgid "Documentation"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:213
#, python-format
msgid ""
"Support %(site_name)s on "
"%(support_title)s "
msgstr ""
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
msgid ""
"BookWyrm is open source software. You can contribute or report issues on GitHub ."
@@ -1298,27 +1302,27 @@ msgstr ""
msgid "Created by %(username)s "
msgstr ""
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
msgid "Pending Books"
msgstr ""
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
msgid "Go to list"
msgstr ""
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
msgid "You're all set!"
msgstr ""
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
msgid "Suggested by"
msgstr ""
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
msgid "Approve"
msgstr ""
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
msgid "Discard"
msgstr ""
@@ -1368,54 +1372,54 @@ msgstr ""
msgid "This list is currently empty"
msgstr ""
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
#, python-format
msgid "Added by %(username)s "
msgstr ""
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
msgid "Set"
msgstr ""
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
msgid "List position"
msgstr ""
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
#: bookwyrm/templates/snippets/shelf_selector.html:26
msgid "Remove"
msgstr ""
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
msgid "Sort List"
msgstr ""
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
msgid "Direction"
msgstr ""
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Add Books"
msgstr ""
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Suggest Books"
msgstr ""
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
msgid "search"
msgstr ""
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
msgid "Clear search"
msgstr ""
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
#, python-format
msgid "No books found matching the query \"%(query)s\""
msgstr ""
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
msgid "Suggest"
msgstr ""
@@ -1740,33 +1744,43 @@ msgstr ""
msgid "Relationships"
msgstr ""
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
msgid "Show"
msgstr ""
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
+#: bookwyrm/templates/search/book.html:64
+msgid "Load results from other catalogues"
msgstr ""
-#: bookwyrm/templates/search_results.html:117
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+msgid "Search query"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:19
+msgid "Search type"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+msgid "Books"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:58
#, python-format
-msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
msgstr ""
#: bookwyrm/templates/settings/admin_layout.html:4
@@ -1777,12 +1791,6 @@ msgstr ""
msgid "Manage Users"
msgstr ""
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr ""
-
#: bookwyrm/templates/settings/admin_layout.html:39
#: bookwyrm/templates/settings/federation.html:3
#: bookwyrm/templates/settings/federation.html:5
@@ -1815,7 +1823,7 @@ msgid "Footer Content"
msgstr ""
#: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
msgid "Registration"
msgstr ""
@@ -1876,7 +1884,7 @@ msgid "Details"
msgstr ""
#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
msgid "Activity"
msgstr ""
@@ -2124,20 +2132,23 @@ msgstr ""
msgid "Admin email:"
msgstr ""
-#: bookwyrm/templates/settings/site.html:79
-msgid "Allow registration:"
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
msgstr ""
#: bookwyrm/templates/settings/site.html:83
-msgid "Allow invite requests:"
+msgid "Allow registration:"
msgstr ""
#: bookwyrm/templates/settings/site.html:87
+msgid "Allow invite requests:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:91
msgid "Registration closed text:"
msgstr ""
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
msgid "No cover"
msgstr ""
@@ -2410,7 +2421,8 @@ msgid "Post privacy"
msgstr ""
#: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
msgid "Followers"
msgstr ""
@@ -2438,16 +2450,16 @@ msgstr ""
msgid "Delete this progress update"
msgstr ""
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
msgid "started"
msgstr ""
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
msgid "Edit read dates"
msgstr ""
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
msgid "Delete these read dates"
msgstr ""
@@ -2494,7 +2506,7 @@ msgstr ""
msgid "quoted"
msgstr ""
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
msgid "Import book"
msgstr ""
@@ -2544,17 +2556,17 @@ msgstr ""
msgid "Want to Read \"%(book_title)s \""
msgstr ""
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
#: bookwyrm/templates/snippets/trimmed_text.html:14
msgid "Show more"
msgstr ""
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
#: bookwyrm/templates/snippets/trimmed_text.html:29
msgid "Show less"
msgstr ""
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
msgid "Open image in new window"
msgstr ""
@@ -2611,42 +2623,16 @@ msgstr ""
msgid "Sorted descending"
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"
-msgstr ""
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr ""
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
msgstr ""
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr ""
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
msgstr ""
#: bookwyrm/templates/user/lists.html:11
@@ -2658,35 +2644,71 @@ msgstr ""
msgid "Create list"
msgstr ""
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr ""
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr ""
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
msgid "All books"
msgstr ""
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
msgid "Create shelf"
msgstr ""
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
msgid "Edit shelf"
msgstr ""
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
msgid "Shelved"
msgstr ""
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
msgid "Started"
msgstr ""
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
msgid "Finished"
msgstr ""
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
msgid "This shelf is empty."
msgstr ""
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
msgid "Delete shelf"
msgstr ""
@@ -2703,52 +2725,42 @@ msgstr ""
msgid "View all books"
msgstr ""
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
msgid "User Activity"
msgstr ""
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
msgid "RSS feed"
msgstr ""
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
msgid "No activities yet!"
msgstr ""
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-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
+#: bookwyrm/templates/user/user_preview.html:14
#, python-format
msgid "Joined %(date)s"
msgstr ""
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
#, python-format
msgid "%(counter)s follower"
msgid_plural "%(counter)s followers"
msgstr[0] ""
msgstr[1] ""
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
#, python-format
msgid "%(counter)s following"
msgstr ""
+#: bookwyrm/templates/user/user_preview.html:25
+#, python-format
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
#: bookwyrm/templates/user_admin/user.html:11
msgid "Back to users"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index dab4c486f..a42908577 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-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\n"
"PO-Revision-Date: 2021-03-19 11:49+0800\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -56,11 +56,12 @@ msgid "Book Title"
msgstr "Título"
#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
msgid "Rating"
msgstr "Calificación"
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
msgid "Sort By"
msgstr "Ordenar por"
@@ -82,7 +83,7 @@ msgstr "%(value)s no es un remote_id válido"
msgid "%(value)s is not a valid username"
msgstr "%(value)s no es un usuario válido"
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
msgid "username"
msgstr "nombre de usuario"
@@ -144,8 +145,8 @@ msgid "Books by %(name)s"
msgstr "Libros de %(name)s"
#: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
msgid "by"
msgstr "por"
@@ -153,50 +154,50 @@ msgstr "por"
msgid "Edit Book"
msgstr "Editar Libro"
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
#: bookwyrm/templates/book/cover_modal.html:5
msgid "Add cover"
msgstr "Agregar portada"
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
msgid "Failed to load cover"
msgstr "No se pudo cargar la portada"
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
msgid "View on OpenLibrary"
msgstr "Ver en OpenLibrary"
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
#, fuzzy
#| msgid "View on OpenLibrary"
msgid "View on Inventaire"
msgstr "Ver en OpenLibrary"
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
#, 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:117
+#: bookwyrm/templates/book/book.html:116
msgid "Add Description"
msgstr "Agregar descripción"
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
#: bookwyrm/templates/book/edit_book.html:107
#: bookwyrm/templates/lists/form.html:12
msgid "Description:"
msgstr "Descripción:"
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:70
#: bookwyrm/templates/settings/edit_server.html:68
#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
#: 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
@@ -204,15 +205,15 @@ msgstr "Descripción:"
msgid "Save"
msgstr "Guardar"
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
#: bookwyrm/templates/edit_author.html:79
#: bookwyrm/templates/moderation/report_modal.html:34
#: bookwyrm/templates/settings/federated_server.html:94
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
#: 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
@@ -220,18 +221,18 @@ msgstr "Guardar"
msgid "Cancel"
msgstr "Cancelar"
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
#, python-format
msgid "%(count)s editions "
msgstr "%(count)s ediciones "
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
#, python-format
msgid "This edition is on your %(shelf_name)s shelf."
msgstr ""
"Esta edición está en tu %(shelf_name)s estante."
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
#, python-format
msgid ""
"A different edition of this book is on your edición diferente de este libro está en tu "
"%(shelf_name)s estante."
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
msgid "Your reading activity"
msgstr "Tu actividad de lectura"
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
msgid "Add read dates"
msgstr "Agregar fechas de lectura"
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
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:175
+#: bookwyrm/templates/book/book.html:177
msgid "Create"
msgstr "Crear"
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr "Sujetos"
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr "Lugares"
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr "Listas"
-
-#: bookwyrm/templates/book/book.html:231
-msgid "Add to list"
-msgstr "Agregar a lista"
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr "Agregar"
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
#, fuzzy
#| msgid "Review"
msgid "Reviews"
msgstr "Reseña"
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
#, fuzzy
#| msgid "Your shelves"
msgid "Your reviews"
msgstr "Tus estantes"
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
#, fuzzy
#| msgid "Your Account"
msgid "Your comments"
msgstr "Tu cuenta"
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
#, fuzzy
#| msgid "Your books"
msgid "Your quotes"
msgstr "Tus libros"
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
msgid "rated it"
msgstr "lo calificó con"
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr "Sujetos"
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr "Lugares"
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr "Listas"
+
+#: bookwyrm/templates/book/book.html:310
+msgid "Add to list"
+msgstr "Agregar a lista"
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr "Agregar"
+
#: bookwyrm/templates/book/book_identifiers.html:8
msgid "ISBN:"
msgstr "ISBN:"
#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
msgid "OCLC Number:"
msgstr "Número OCLC:"
#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
msgid "ASIN:"
msgstr "ASIN:"
#: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
msgid "Upload cover:"
msgstr "Subir portada:"
#: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
msgid "Load cover from url:"
msgstr "Agregar portada de url:"
@@ -455,36 +457,36 @@ msgid "John Doe, Jane Smith"
msgstr "Juan Nadie, Natalia Natalia"
#: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
msgid "Cover"
msgstr "Portada:"
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
msgid "Physical Properties"
msgstr "Propiedades físicas:"
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
#: bookwyrm/templates/book/format_filter.html:5
msgid "Format:"
msgstr "Formato:"
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
msgid "Pages:"
msgstr "Páginas:"
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
msgid "Book Identifiers"
msgstr "Identificadores de libro"
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
msgid "ISBN 13:"
msgstr "ISBN 13:"
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
msgid "ISBN 10:"
msgstr "ISBN 10:"
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
#: bookwyrm/templates/edit_author.html:59
msgid "Openlibrary key:"
msgstr "Clave OpenLibrary:"
@@ -548,7 +550,7 @@ msgstr "Publicado por %(publisher)s."
#: bookwyrm/templates/feed/feed_layout.html:70
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
msgid "Close"
msgstr "Cerrar"
@@ -568,17 +570,17 @@ msgstr "Usuarios locales"
msgid "Federated community"
msgstr "Comunidad federalizada"
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
#: bookwyrm/templates/layout.html:93
msgid "Directory"
msgstr "Directorio"
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
msgid "Make your profile discoverable to other BookWyrm users."
msgstr "Haz que tu perfil sea reconocible a otros usarios de BookWyrm."
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
#, python-format
msgid ""
"You can opt-out at any time in your profile settings."
@@ -587,31 +589,11 @@ msgstr ""
"Puedes optar por no en cualquier hora en tus configuraciones de perfil. "
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
#: bookwyrm/templates/snippets/goal_card.html:22
msgid "Dismiss message"
msgstr "Desechar mensaje"
-#: bookwyrm/templates/directory/directory.html:71
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] "seguidor que tu sigues"
-msgstr[1] "seguidores que tu sigues"
-
-#: bookwyrm/templates/directory/directory.html:78
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] "libro en tus estantes"
-msgstr[1] "libro en tus estantes"
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr "publicaciones"
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr "actividad reciente"
-
#: bookwyrm/templates/directory/sort_filter.html:5
msgid "Order by"
msgstr "Ordenar por"
@@ -624,6 +606,26 @@ msgstr "Sugerido"
msgid "Recently active"
msgstr "Activ@ recientemente"
+#: bookwyrm/templates/directory/user_card.html:32
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "seguidor que tu sigues"
+msgstr[1] "seguidores que tu sigues"
+
+#: bookwyrm/templates/directory/user_card.html:39
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "libro en tus estantes"
+msgstr[1] "libro en tus estantes"
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr "publicaciones"
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr "actividad reciente"
+
#: bookwyrm/templates/directory/user_type_filter.html:5
msgid "User type"
msgstr "Tipo de usuario"
@@ -711,8 +713,8 @@ msgid "Edit Author:"
msgstr "Editar Autor/Autora/Autore:"
#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
msgid "Name:"
msgstr "Nombre:"
@@ -890,7 +892,7 @@ msgstr "Actualizaciones"
#: bookwyrm/templates/feed/feed_layout.html:11
#: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
msgid "Your books"
msgstr "Tus libros"
@@ -900,18 +902,18 @@ msgid ""
msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "To Read"
msgstr "Para leer"
#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Currently Reading"
msgstr "Leyendo actualmente"
#: bookwyrm/templates/feed/feed_layout.html:26
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Read"
msgstr "Leido"
@@ -945,13 +947,12 @@ msgid "What are you reading?"
msgstr "¿Qué estás leyendo?"
#: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
msgid "Search for a book"
msgstr "Buscar libros"
#: bookwyrm/templates/get_started/books.html:11
#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
#, python-format
msgid "No books found for \"%(query)s\""
msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
@@ -966,25 +967,27 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
#: bookwyrm/templates/get_started/users.html:18
#: bookwyrm/templates/get_started/users.html:19
#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
msgid "Search"
msgstr "Buscar"
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
msgid "Suggested Books"
msgstr "Libros sugeridos"
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
#, python-format
msgid "Popular on %(site_name)s"
msgstr "Popular en %(site_name)s"
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
msgid "No books found"
msgstr "No se encontró ningún libro"
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
#: bookwyrm/templates/get_started/profile.html:54
msgid "Save & continue"
msgstr "Guardar & continuar"
@@ -1061,7 +1064,6 @@ msgid "Search for a user"
msgstr "Buscar un usuario"
#: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
#, python-format
msgid "No users found for \"%(query)s\""
msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
@@ -1185,18 +1187,19 @@ msgid "Successfully imported"
msgstr "Importado exitosamente"
#: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
msgid "Book"
msgstr "Libro"
#: bookwyrm/templates/import_status.html:115
#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
msgid "Title"
msgstr "Título"
#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
msgid "Author"
msgstr "Autor/Autora"
@@ -1218,18 +1221,15 @@ msgid "Sorry! This invite code is no longer valid."
msgstr "¡Disculpa! Este código de invitación no queda válido."
#: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
msgid "Search Results"
msgstr "Resultados de búsqueda"
#: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
#, python-format
msgid "Search Results for \"%(query)s\""
msgstr "Resultados de búsqueda por \"%(query)s\""
#: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
msgid "Matching Books"
msgstr "Libros correspondientes"
@@ -1271,38 +1271,44 @@ msgstr "Cerrar sesión"
msgid "Notifications"
msgstr "Notificaciones"
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
#: bookwyrm/templates/login.html:17
#: bookwyrm/templates/snippets/register_form.html:4
msgid "Username:"
msgstr "Nombre de usuario:"
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
msgid "password"
msgstr "contraseña"
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
msgid "Forgot your password?"
msgstr "¿Olvidaste tu contraseña?"
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
#: bookwyrm/templates/login.html:33
msgid "Log in"
msgstr "Iniciar sesión"
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
msgid "Join"
msgstr "Unirse"
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
msgid "About this server"
msgstr "Sobre este servidor"
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
msgid "Contact site admin"
msgstr "Contactarse con administradores del sitio"
#: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "Django Documentation"
+msgid "Documentation"
+msgstr "Documentación de Django"
+
+#: bookwyrm/templates/layout.html:213
#, python-format
msgid ""
"Support %(site_name)s on "
@@ -1311,7 +1317,7 @@ msgstr ""
"Apoyar %(site_name)s en "
"%(support_title)s "
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
msgid ""
"BookWyrm is open source software. You can contribute or report issues on GitHub ."
@@ -1334,27 +1340,27 @@ msgstr "Agregado y comisariado por %(username)s "
msgid "Created by %(username)s "
msgstr "Creado por %(username)s "
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
msgid "Pending Books"
msgstr "Libros pendientes"
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
msgid "Go to list"
msgstr "Irse a lista"
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
msgid "You're all set!"
msgstr "!Está todo listo¡"
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
msgid "Suggested by"
msgstr "Sugerido por"
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
msgid "Approve"
msgstr "Aprobar"
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
msgid "Discard"
msgstr "Desechar"
@@ -1406,55 +1412,55 @@ msgstr "Cualquer usuario puede agregar libros a esta lista"
msgid "This list is currently empty"
msgstr "Esta lista está vacia"
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
#, python-format
msgid "Added by %(username)s "
msgstr "Agregado por %(username)s "
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
msgid "Set"
msgstr "Establecido"
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
msgid "List position"
msgstr "Posición"
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
#: bookwyrm/templates/snippets/shelf_selector.html:26
msgid "Remove"
msgstr "Quitar"
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
msgid "Sort List"
msgstr "Ordena la lista"
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
msgid "Direction"
msgstr "Dirección"
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Add Books"
msgstr "Agregar libros"
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Suggest Books"
msgstr "Sugerir libros"
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
msgid "search"
msgstr "buscar"
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
msgid "Clear search"
msgstr "Borrar búsqueda"
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
#, python-format
msgid "No books found matching the query \"%(query)s\""
msgstr ""
"No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
msgid "Suggest"
msgstr "Sugerir"
@@ -1812,35 +1818,52 @@ msgstr "Perfil"
msgid "Relationships"
msgstr "Relaciones"
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr "¿No encontraste lo que buscabas?"
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr "Mostrar resultados de otros catálogos"
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr "Ocultar resultados de otros catálogos"
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
#, fuzzy
#| msgid "Show more"
msgid "Show"
msgstr "Mostrar más"
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
-msgstr "Usuarios correspondientes"
+#: bookwyrm/templates/search/book.html:64
+#, fuzzy
+#| msgid "Show results from other catalogues"
+msgid "Load results from other catalogues"
+msgstr "Mostrar resultados de otros catálogos"
-#: bookwyrm/templates/search_results.html:117
-#, python-format
-msgid "No lists found for \"%(query)s\""
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+#, fuzzy
+#| msgid "Search for a user"
+msgid "Search query"
+msgstr "Buscar un usuario"
+
+#: bookwyrm/templates/search/layout.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search type"
+msgstr "Buscar"
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+msgid "Books"
+msgstr "Libros"
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr "Usuarios"
+
+#: bookwyrm/templates/search/layout.html:58
+#, fuzzy, python-format
+#| msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\""
#: bookwyrm/templates/settings/admin_layout.html:4
@@ -1851,12 +1874,6 @@ msgstr "Adminstración"
msgid "Manage Users"
msgstr "Administrar usuarios"
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr "Usuarios"
-
#: bookwyrm/templates/settings/admin_layout.html:39
#: bookwyrm/templates/settings/federation.html:3
#: bookwyrm/templates/settings/federation.html:5
@@ -1889,7 +1906,7 @@ msgid "Footer Content"
msgstr "Contenido del pie de página"
#: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
msgid "Registration"
msgstr "Registración"
@@ -1950,7 +1967,7 @@ msgid "Details"
msgstr "Detalles"
#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
msgid "Activity"
msgstr "Actividad"
@@ -2198,20 +2215,23 @@ msgstr "Título de apoyo:"
msgid "Admin email:"
msgstr "Correo electrónico de administradorx:"
-#: bookwyrm/templates/settings/site.html:79
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
msgid "Allow registration:"
msgstr "Permitir registración:"
-#: bookwyrm/templates/settings/site.html:83
+#: bookwyrm/templates/settings/site.html:87
msgid "Allow invite requests:"
msgstr "Permitir solicitudes de invitación:"
-#: bookwyrm/templates/settings/site.html:87
+#: bookwyrm/templates/settings/site.html:91
msgid "Registration closed text:"
msgstr "Texto de registración cerrada:"
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
msgid "No cover"
msgstr "Sin portada"
@@ -2504,7 +2524,8 @@ msgid "Post privacy"
msgstr "Privacidad de publicación"
#: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
msgid "Followers"
msgstr "Seguidores"
@@ -2532,16 +2553,16 @@ msgstr "Mostrar todas las actualizaciones"
msgid "Delete this progress update"
msgstr "Eliminar esta actualización de progreso"
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
msgid "started"
msgstr "empezado"
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
msgid "Edit read dates"
msgstr "Editar fechas de lectura"
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
msgid "Delete these read dates"
msgstr "Eliminar estas fechas de lectura"
@@ -2588,7 +2609,7 @@ msgstr "comentó en"
msgid "quoted"
msgstr "citó"
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
msgid "Import book"
msgstr "Importar libro"
@@ -2638,17 +2659,17 @@ msgstr "Empezar \"%(book_title)s \""
msgid "Want to Read \"%(book_title)s \""
msgstr "Quiero leer \"%(book_title)s \""
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
#: bookwyrm/templates/snippets/trimmed_text.html:14
msgid "Show more"
msgstr "Mostrar más"
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
#: bookwyrm/templates/snippets/trimmed_text.html:29
msgid "Show less"
msgstr "Mostrar menos"
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
msgid "Open image in new window"
msgstr "Abrir imagen en una nueva ventana"
@@ -2707,43 +2728,17 @@ msgstr "En orden ascendente"
msgid "Sorted descending"
msgstr "En orden descendente"
-#: bookwyrm/templates/user/books_header.html:5
-#, python-format
-msgid "%(username)s's books"
-msgstr "Los libros de %(username)s"
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create Shelf"
-msgstr "Crear estante"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr "Editar estante"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr "Actualizar estante"
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Perfil de usuario"
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
-msgstr "%(username)s no tiene seguidores"
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
+msgstr "Solicitudes de seguidor"
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr "Siguiendo"
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr "%(username)s no sigue a nadie"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
+msgstr "Meta de lectura"
#: bookwyrm/templates/user/lists.html:11
#, python-format
@@ -2754,35 +2749,71 @@ msgstr "Listas: %(username)s"
msgid "Create list"
msgstr "Crear lista"
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "%(username)s no tiene seguidores"
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr "Siguiendo"
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s no sigue a nadie"
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr "Los libros de %(username)s"
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr "Crear estante"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "Editar estante"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "Actualizar estante"
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
msgid "All books"
msgstr "Todos los libros"
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
msgid "Create shelf"
msgstr "Crear estante"
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
msgid "Edit shelf"
msgstr "Editar estante"
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
msgid "Shelved"
msgstr "Archivado"
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
msgid "Started"
msgstr "Empezado"
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
msgid "Finished"
msgstr "Terminado"
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
msgid "This shelf is empty."
msgstr "Este estante está vacio."
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
msgid "Delete shelf"
msgstr "Eliminar estante"
@@ -2799,52 +2830,44 @@ msgstr "Ver todos los %(size)s"
msgid "View all books"
msgstr "Ver todos los libros"
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr "Establecer una meta de lectura para %(year)s"
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
msgid "User Activity"
msgstr "Actividad de usuario"
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
msgid "RSS feed"
msgstr "Feed RSS"
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
msgid "No activities yet!"
msgstr "¡Aún no actividades!"
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-msgstr "Solicitudes de seguidor"
-
-#: bookwyrm/templates/user/user_layout.html:56
-msgid "Reading Goal"
-msgstr "Meta de lectura"
-
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Books"
-msgstr "Libros"
-
-#: bookwyrm/templates/user/user_preview.html:13
+#: bookwyrm/templates/user/user_preview.html:14
#, python-format
msgid "Joined %(date)s"
msgstr "Unido %(date)s"
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
#, python-format
msgid "%(counter)s follower"
msgid_plural "%(counter)s followers"
msgstr[0] "%(counter)s seguidor"
msgstr[1] "%(counter)s seguidores"
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
#, python-format
msgid "%(counter)s following"
msgstr "%(counter)s siguiendo"
+#: bookwyrm/templates/user/user_preview.html:25
+#, fuzzy, python-format
+#| msgid "%(mutuals)s follower you follow"
+#| msgid_plural "%(mutuals)s followers you follow"
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] "%(mutuals)s seguidor que sigues"
+msgstr[1] "%(mutuals)s seguidores que sigues"
+
#: bookwyrm/templates/user_admin/user.html:11
msgid "Back to users"
msgstr "Volver a usuarios"
@@ -4311,6 +4334,19 @@ msgctxt "stick"
msgid "club"
msgstr "garrote"
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "¿No encontraste lo que buscabas?"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "Ocultar resultados de otros catálogos"
+
+#~ msgid "Matching Users"
+#~ msgstr "Usuarios correspondientes"
+
+#, python-format
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "Establecer una meta de lectura para %(year)s"
+
#, python-format
#~ msgid "by %(author)s"
#~ msgstr "por %(author)s"
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 01963e467..7717fe481 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-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\n"
"PO-Revision-Date: 2021-04-05 12:44+0100\n"
"Last-Translator: Fabien Basmaison \n"
"Language-Team: Mouse Reeve \n"
@@ -58,11 +58,12 @@ msgid "Book Title"
msgstr "Titre"
#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
msgid "Rating"
msgstr "Note"
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
msgid "Sort By"
msgstr ""
@@ -88,7 +89,7 @@ msgstr "%(value)s n’est pas une remote_id valide."
msgid "%(value)s is not a valid username"
msgstr "%(value)s n’est pas un nom de compte valide."
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
msgid "username"
msgstr "nom du compte :"
@@ -150,8 +151,8 @@ msgid "Books by %(name)s"
msgstr "Livres par %(name)s"
#: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
msgid "by"
msgstr "par"
@@ -159,50 +160,50 @@ msgstr "par"
msgid "Edit Book"
msgstr "Modifier le livre"
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
#: bookwyrm/templates/book/cover_modal.html:5
msgid "Add cover"
msgstr "Ajouter une couverture"
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
msgid "Failed to load cover"
msgstr "La couverture n’a pu être chargée"
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
msgid "View on OpenLibrary"
msgstr "Voir sur OpenLibrary"
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
#, fuzzy
#| msgid "View on OpenLibrary"
msgid "View on Inventaire"
msgstr "Voir sur OpenLibrary"
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
#, python-format
msgid "(%(review_count)s review)"
msgid_plural "(%(review_count)s reviews)"
msgstr[0] "(%(review_count)s critique)"
msgstr[1] "(%(review_count)s critiques)"
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:116
msgid "Add Description"
msgstr "Ajouter une description"
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
#: bookwyrm/templates/book/edit_book.html:107
#: bookwyrm/templates/lists/form.html:12
msgid "Description:"
msgstr "Description :"
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:70
#: bookwyrm/templates/settings/edit_server.html:68
#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
#: 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
@@ -210,15 +211,15 @@ msgstr "Description :"
msgid "Save"
msgstr "Enregistrer"
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
#: bookwyrm/templates/edit_author.html:79
#: bookwyrm/templates/moderation/report_modal.html:34
#: bookwyrm/templates/settings/federated_server.html:94
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
#: 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
@@ -226,18 +227,18 @@ msgstr "Enregistrer"
msgid "Cancel"
msgstr "Annuler"
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
#, python-format
msgid "%(count)s editions "
msgstr "%(count)s éditions "
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
#, python-format
msgid "This edition is on your %(shelf_name)s shelf."
msgstr ""
"Cette édition est sur votre étagère %(shelf_name)s ."
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
#, python-format
msgid ""
"A different edition of this book is on your édition différente de ce livre existe sur "
"votre étagère %(shelf_name)s ."
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
msgid "Your reading activity"
msgstr "Votre activité de lecture"
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
msgid "Add read dates"
msgstr "Ajouter des dates de lecture"
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
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:175
+#: bookwyrm/templates/book/book.html:177
msgid "Create"
msgstr "Créer"
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr "Sujets"
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr "Lieux"
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr "Listes"
-
-#: bookwyrm/templates/book/book.html:231
-msgid "Add to list"
-msgstr "Ajouter à la liste"
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr "Ajouter"
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
#, fuzzy
#| msgid "Review"
msgid "Reviews"
msgstr "Critique"
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
#, fuzzy
#| msgid "Your shelves"
msgid "Your reviews"
msgstr "Vos étagères"
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
#, fuzzy
#| msgid "Your Account"
msgid "Your comments"
msgstr "Votre compte"
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
#, fuzzy
#| msgid "Your books"
msgid "Your quotes"
msgstr "Vos livres"
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
msgid "rated it"
msgstr "l’a noté"
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr "Sujets"
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr "Lieux"
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr "Listes"
+
+#: bookwyrm/templates/book/book.html:310
+msgid "Add to list"
+msgstr "Ajouter à la liste"
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr "Ajouter"
+
#: bookwyrm/templates/book/book_identifiers.html:8
msgid "ISBN:"
msgstr "ISBN :"
#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
msgid "OCLC Number:"
msgstr "Numéro OCLC :"
#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
msgid "ASIN:"
msgstr "ASIN :"
#: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
msgid "Upload cover:"
msgstr "Charger une couverture :"
#: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
msgid "Load cover from url:"
msgstr "Charger la couverture depuis une URL :"
@@ -461,36 +463,36 @@ msgid "John Doe, Jane Smith"
msgstr "Claude Dupont, Dominique Durand"
#: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
msgid "Cover"
msgstr "Couverture"
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
msgid "Physical Properties"
msgstr "Propriétés physiques"
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
#: bookwyrm/templates/book/format_filter.html:5
msgid "Format:"
msgstr "Format :"
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
msgid "Pages:"
msgstr "Pages :"
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
msgid "Book Identifiers"
msgstr "Identifiants du livre"
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
msgid "ISBN 13:"
msgstr "ISBN 13 :"
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
msgid "ISBN 10:"
msgstr "ISBN 10 :"
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
#: bookwyrm/templates/edit_author.html:59
msgid "Openlibrary key:"
msgstr "Clé Openlibrary :"
@@ -554,7 +556,7 @@ msgstr "Publié par %(publisher)s."
#: bookwyrm/templates/feed/feed_layout.html:70
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
msgid "Close"
msgstr "Fermer"
@@ -574,19 +576,19 @@ msgstr "Comptes locaux"
msgid "Federated community"
msgstr "Communauté fédérée"
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
#: bookwyrm/templates/layout.html:93
msgid "Directory"
msgstr "Répertoire"
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
msgid "Make your profile discoverable to other BookWyrm users."
msgstr ""
"Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir "
"votre profil."
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
#, python-format
msgid ""
"You can opt-out at any time in your profile settings."
@@ -595,31 +597,11 @@ msgstr ""
"Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos "
" paramètres de profil. "
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
#: bookwyrm/templates/snippets/goal_card.html:22
msgid "Dismiss message"
msgstr "Rejeter le message"
-#: bookwyrm/templates/directory/directory.html:71
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] "compte auquel vous êtes abonné(e)"
-msgstr[1] "comptes auxquels vous êtes abonné(e)"
-
-#: bookwyrm/templates/directory/directory.html:78
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] "livre sur vos étagères"
-msgstr[1] "livres sur vos étagères"
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr "publications"
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr "dernière activité"
-
#: bookwyrm/templates/directory/sort_filter.html:5
msgid "Order by"
msgstr "Trier par"
@@ -632,6 +614,26 @@ msgstr "Suggéré"
msgid "Recently active"
msgstr "Actif récemment"
+#: bookwyrm/templates/directory/user_card.html:32
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "compte auquel vous êtes abonné(e)"
+msgstr[1] "comptes auxquels vous êtes abonné(e)"
+
+#: bookwyrm/templates/directory/user_card.html:39
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "livre sur vos étagères"
+msgstr[1] "livres sur vos étagères"
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr "publications"
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr "dernière activité"
+
#: bookwyrm/templates/directory/user_type_filter.html:5
msgid "User type"
msgstr "Type de compte"
@@ -719,8 +721,8 @@ msgid "Edit Author:"
msgstr "Modifier l’auteur ou l’autrice :"
#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
msgid "Name:"
msgstr "Nom :"
@@ -900,7 +902,7 @@ msgstr "Mises à jour"
#: bookwyrm/templates/feed/feed_layout.html:11
#: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
msgid "Your books"
msgstr "Vos livres"
@@ -910,18 +912,18 @@ msgid ""
msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "To Read"
msgstr "À lire"
#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Currently Reading"
msgstr "En train de lire"
#: bookwyrm/templates/feed/feed_layout.html:26
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Read"
msgstr "Lu"
@@ -955,13 +957,12 @@ msgid "What are you reading?"
msgstr "Que lisez‑vous ?"
#: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
msgid "Search for a book"
msgstr "Chercher un livre"
#: bookwyrm/templates/get_started/books.html:11
#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
#, python-format
msgid "No books found for \"%(query)s\""
msgstr "Aucun livre trouvé pour « %(query)s »"
@@ -978,25 +979,27 @@ msgstr ""
#: bookwyrm/templates/get_started/users.html:18
#: bookwyrm/templates/get_started/users.html:19
#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
msgid "Search"
msgstr "Chercher"
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
msgid "Suggested Books"
msgstr "Suggérer des livres"
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
#, python-format
msgid "Popular on %(site_name)s"
msgstr "Populaire sur %(site_name)s"
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
msgid "No books found"
msgstr "Aucun livre trouvé"
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
#: bookwyrm/templates/get_started/profile.html:54
msgid "Save & continue"
msgstr "Enregistrer & continuer"
@@ -1073,7 +1076,6 @@ msgid "Search for a user"
msgstr "Chercher un compte"
#: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
#, python-format
msgid "No users found for \"%(query)s\""
msgstr "Aucun compte trouvé pour « %(query)s »"
@@ -1197,18 +1199,19 @@ msgid "Successfully imported"
msgstr "Importation réussie"
#: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
msgid "Book"
msgstr "Livre"
#: bookwyrm/templates/import_status.html:115
#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
msgid "Title"
msgstr "Titre"
#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
msgid "Author"
msgstr "Auteur ou autrice"
@@ -1230,18 +1233,15 @@ msgid "Sorry! This invite code is no longer valid."
msgstr "Cette invitation n’est plus valide ; désolé !"
#: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
msgid "Search Results"
msgstr "Résultats de recherche"
#: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
#, python-format
msgid "Search Results for \"%(query)s\""
msgstr "Résultats de recherche pour « %(query)s »"
#: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
msgid "Matching Books"
msgstr "Livres correspondants"
@@ -1283,38 +1283,44 @@ msgstr "Se déconnecter"
msgid "Notifications"
msgstr "Notifications"
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
#: bookwyrm/templates/login.html:17
#: bookwyrm/templates/snippets/register_form.html:4
msgid "Username:"
msgstr "Nom du compte :"
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
msgid "password"
msgstr "Mot de passe"
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
msgid "Forgot your password?"
msgstr "Mot de passe oublié ?"
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
#: bookwyrm/templates/login.html:33
msgid "Log in"
msgstr "Se connecter"
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
msgid "Join"
msgstr "Rejoindre"
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
msgid "About this server"
msgstr "À propos de ce serveur"
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
msgid "Contact site admin"
msgstr "Contacter l’administrateur du site"
#: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "List curation:"
+msgid "Documentation"
+msgstr "Modération de la liste :"
+
+#: bookwyrm/templates/layout.html:213
#, python-format
msgid ""
"Support %(site_name)s on "
@@ -1323,7 +1329,7 @@ msgstr ""
"Soutenez %(site_name)s avec "
"%(support_title)s "
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
msgid ""
"BookWyrm is open source software. You can contribute or report issues on GitHub ."
@@ -1346,27 +1352,27 @@ msgstr "Créée et modérée par %(username)s "
msgid "Created by %(username)s "
msgstr "Créée par %(username)s "
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
msgid "Pending Books"
msgstr "Livres en attente de modération"
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
msgid "Go to list"
msgstr "Aller à la liste"
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
msgid "You're all set!"
msgstr "Aucun livre en attente de validation !"
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
msgid "Suggested by"
msgstr "Suggéré par"
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
msgid "Approve"
msgstr "Approuver"
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
msgid "Discard"
msgstr "Rejeter"
@@ -1418,62 +1424,62 @@ msgstr "N’importe qui peut suggérer des livres"
msgid "This list is currently empty"
msgstr "Cette liste est vide actuellement"
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
#, python-format
msgid "Added by %(username)s "
msgstr "Ajoutée par %(username)s "
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
#, fuzzy
#| msgid "Sent"
msgid "Set"
msgstr "Envoyé(e)s"
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
#, fuzzy
#| msgid "List curation:"
msgid "List position"
msgstr "Modération de la liste :"
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
#: bookwyrm/templates/snippets/shelf_selector.html:26
msgid "Remove"
msgstr "Supprimer"
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
#, fuzzy
#| msgid "Your Lists"
msgid "Sort List"
msgstr "Vos listes"
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
#, fuzzy
#| msgid "Directory"
msgid "Direction"
msgstr "Répertoire"
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Add Books"
msgstr "Ajouter des livres"
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Suggest Books"
msgstr "Suggérer des livres"
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
msgid "search"
msgstr "Chercher"
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
msgid "Clear search"
msgstr "Vider la requête"
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
#, python-format
msgid "No books found matching the query \"%(query)s\""
msgstr "Aucun livre trouvé pour la requête « %(query)s »"
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
msgid "Suggest"
msgstr "Suggérer"
@@ -1837,35 +1843,52 @@ msgstr "Profil"
msgid "Relationships"
msgstr "Relations"
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr "Montrer les résultats d’autres catalogues"
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr "Masquer les résultats d’autres catalogues"
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
#, fuzzy
#| msgid "Show more"
msgid "Show"
msgstr "Déplier"
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
-msgstr "Comptes correspondants"
+#: bookwyrm/templates/search/book.html:64
+#, fuzzy
+#| msgid "Show results from other catalogues"
+msgid "Load results from other catalogues"
+msgstr "Montrer les résultats d’autres catalogues"
-#: bookwyrm/templates/search_results.html:117
-#, python-format
-msgid "No lists found for \"%(query)s\""
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+#, fuzzy
+#| msgid "Search for a user"
+msgid "Search query"
+msgstr "Chercher un compte"
+
+#: bookwyrm/templates/search/layout.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search type"
+msgstr "Chercher"
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+msgid "Books"
+msgstr "Livres"
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr "Comptes"
+
+#: bookwyrm/templates/search/layout.html:58
+#, fuzzy, python-format
+#| msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
msgstr "Aucune liste trouvée pour « %(query)s »"
#: bookwyrm/templates/settings/admin_layout.html:4
@@ -1876,12 +1899,6 @@ msgstr "Administration"
msgid "Manage Users"
msgstr "Gérer les comptes"
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr "Comptes"
-
#: bookwyrm/templates/settings/admin_layout.html:39
#: bookwyrm/templates/settings/federation.html:3
#: bookwyrm/templates/settings/federation.html:5
@@ -1914,7 +1931,7 @@ msgid "Footer Content"
msgstr "Contenu du pied de page"
#: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
msgid "Registration"
msgstr "Enregistrement"
@@ -1983,7 +2000,7 @@ msgid "Details"
msgstr "Détails"
#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
msgid "Activity"
msgstr "Activité"
@@ -2237,20 +2254,23 @@ msgstr "Titre pour soutenir l’instance :"
msgid "Admin email:"
msgstr "Email de l’administrateur :"
-#: bookwyrm/templates/settings/site.html:79
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
msgid "Allow registration:"
msgstr "Autoriser l’enregistrement :"
-#: bookwyrm/templates/settings/site.html:83
+#: bookwyrm/templates/settings/site.html:87
msgid "Allow invite requests:"
msgstr "Autoriser les demandes d’invitation :"
-#: bookwyrm/templates/settings/site.html:87
+#: bookwyrm/templates/settings/site.html:91
msgid "Registration closed text:"
msgstr "Texte affiché lorsque les enregistrements sont clos :"
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
msgid "No cover"
msgstr "Aucune couverture"
@@ -2538,7 +2558,8 @@ msgid "Post privacy"
msgstr "Confidentialité du statut"
#: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
msgid "Followers"
msgstr "Abonnements"
@@ -2566,16 +2587,16 @@ msgstr "Montrer toutes les progressions"
msgid "Delete this progress update"
msgstr "Supprimer cette mise à jour"
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
msgid "started"
msgstr "commencé"
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
msgid "Edit read dates"
msgstr "Modifier les date de lecture"
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
msgid "Delete these read dates"
msgstr "Supprimer ces dates de lecture"
@@ -2622,7 +2643,7 @@ msgstr "a commenté"
msgid "quoted"
msgstr "a cité"
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
msgid "Import book"
msgstr "Importer le livre"
@@ -2672,17 +2693,17 @@ msgstr "Commencer « %(book_title)s »"
msgid "Want to Read \"%(book_title)s \""
msgstr "A envie de lire « %(book_title)s »"
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
#: bookwyrm/templates/snippets/trimmed_text.html:14
msgid "Show more"
msgstr "Déplier"
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
#: bookwyrm/templates/snippets/trimmed_text.html:29
msgid "Show less"
msgstr "Replier"
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
msgid "Open image in new window"
msgstr "Ouvrir l’image dans une nouvelle fenêtre"
@@ -2741,43 +2762,17 @@ msgstr "Trié par ordre croissant"
msgid "Sorted descending"
msgstr "Trié par ordre décroissant"
-#: bookwyrm/templates/user/books_header.html:5
-#, python-format
-msgid "%(username)s's books"
-msgstr "Livres de %(username)s"
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create Shelf"
-msgstr "Créer l’étagère"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr "Modifier l’étagère"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr "Mettre l’étagère à jour"
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Profil"
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
-msgstr "%(username)s n’a pas d’abonné(e)"
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
+msgstr "Demandes d’abonnement"
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr "Abonné(e) à"
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr "%(username)s n’est abonné(e) à personne"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
+msgstr "Défi lecture"
#: bookwyrm/templates/user/lists.html:11
#, python-format
@@ -2788,35 +2783,71 @@ msgstr "Listes : %(username)s"
msgid "Create list"
msgstr "Créer une liste"
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "%(username)s n’a pas d’abonné(e)"
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr "Abonné(e) à"
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s n’est abonné(e) à personne"
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr "Livres de %(username)s"
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr "Créer l’étagère"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "Modifier l’étagère"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "Mettre l’étagère à jour"
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
msgid "All books"
msgstr "Tous les livres"
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
msgid "Create shelf"
msgstr "Créer l’étagère"
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
msgid "Edit shelf"
msgstr "Modifier l’étagère"
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
msgid "Shelved"
msgstr "Ajouté à une étagère"
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
msgid "Started"
msgstr "Commencé"
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
msgid "Finished"
msgstr "Terminé"
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
msgid "This shelf is empty."
msgstr "Cette étagère est vide"
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
msgid "Delete shelf"
msgstr "Supprimer l’étagère"
@@ -2833,52 +2864,44 @@ msgstr "Voir les %(size)s"
msgid "View all books"
msgstr "Voir tous les livres"
-#: bookwyrm/templates/user/user.html:59
-#, 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:65
+#: bookwyrm/templates/user/user.html:60
msgid "User Activity"
msgstr "Activité du compte"
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
msgid "RSS feed"
msgstr "Flux RSS"
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
msgid "No activities yet!"
msgstr "Aucune activité pour l’instant !"
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-msgstr "Demandes d’abonnement"
-
-#: bookwyrm/templates/user/user_layout.html:56
-msgid "Reading Goal"
-msgstr "Défi lecture"
-
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Books"
-msgstr "Livres"
-
-#: bookwyrm/templates/user/user_preview.html:13
+#: bookwyrm/templates/user/user_preview.html:14
#, python-format
msgid "Joined %(date)s"
msgstr "Enregistré(e) %(date)s"
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
#, python-format
msgid "%(counter)s follower"
msgid_plural "%(counter)s followers"
msgstr[0] "%(counter)s abonnement"
msgstr[1] "%(counter)s abonnements"
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
#, python-format
msgid "%(counter)s following"
msgstr "%(counter)s abonnements"
+#: bookwyrm/templates/user/user_preview.html:25
+#, fuzzy, python-format
+#| msgid "%(mutuals)s follower you follow"
+#| msgid_plural "%(mutuals)s followers you follow"
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] "%(mutuals)s abonnement auxquel vous êtes abonné(e)"
+msgstr[1] "%(mutuals)s abonnements auxquels vous êtes abonné(e)"
+
#: bookwyrm/templates/user_admin/user.html:11
#, fuzzy
#| msgid "Back to reports"
@@ -4353,6 +4376,19 @@ msgctxt "stick"
msgid "club"
msgstr ""
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "Masquer les résultats d’autres catalogues"
+
+#~ msgid "Matching Users"
+#~ msgstr "Comptes correspondants"
+
+#, python-format
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "Définir un défi lecture pour %(year)s"
+
#, python-format
#~ msgid "by %(author)s"
#~ msgstr "par %(author)s"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 783fc70ab..9c863e41c 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/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-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\n"
"PO-Revision-Date: 2021-03-20 00:56+0000\n"
"Last-Translator: Kana \n"
"Language-Team: Mouse Reeve \n"
@@ -58,11 +58,12 @@ msgid "Book Title"
msgstr "标题"
#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
msgid "Rating"
msgstr "评价"
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
msgid "Sort By"
msgstr ""
@@ -88,7 +89,7 @@ msgstr "%(value)s 不是有效的 remote_id"
msgid "%(value)s is not a valid username"
msgstr "%(value)s 不是有效的用户名"
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
msgid "username"
msgstr "用户名"
@@ -150,8 +151,8 @@ msgid "Books by %(name)s"
msgstr "%(name)s 所著的书"
#: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
msgid "by"
msgstr "作者"
@@ -159,49 +160,49 @@ msgstr "作者"
msgid "Edit Book"
msgstr "编辑书目"
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
#: bookwyrm/templates/book/cover_modal.html:5
msgid "Add cover"
msgstr "添加封面"
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
msgid "Failed to load cover"
msgstr "加载封面失败"
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
msgid "View on OpenLibrary"
msgstr "在 OpenLibrary 查看"
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
#, fuzzy
#| msgid "View on OpenLibrary"
msgid "View on Inventaire"
msgstr "在 OpenLibrary 查看"
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
#, python-format
msgid "(%(review_count)s review)"
msgid_plural "(%(review_count)s reviews)"
msgstr[0] "(%(review_count)s 则书评)"
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:116
msgid "Add Description"
msgstr "添加描述"
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
#: bookwyrm/templates/book/edit_book.html:107
#: bookwyrm/templates/lists/form.html:12
msgid "Description:"
msgstr "描述:"
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:70
#: bookwyrm/templates/settings/edit_server.html:68
#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
#: 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
@@ -209,15 +210,15 @@ msgstr "描述:"
msgid "Save"
msgstr "保存"
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
#: bookwyrm/templates/edit_author.html:79
#: bookwyrm/templates/moderation/report_modal.html:34
#: bookwyrm/templates/settings/federated_server.html:94
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
#: 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
@@ -225,17 +226,17 @@ msgstr "保存"
msgid "Cancel"
msgstr "取消"
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
#, python-format
msgid "%(count)s editions "
msgstr "%(count)s 个版本 "
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
#, python-format
msgid "This edition is on your %(shelf_name)s shelf."
msgstr "此版本在你的 %(shelf_name)s 书架上。"
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
#, python-format
msgid ""
"A different edition of this book is on your 另一个版本 在你的 %(shelf_name)s 书架上。"
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
msgid "Your reading activity"
msgstr "你的阅读活动"
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
msgid "Add read dates"
msgstr "添加阅读日期"
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
msgid "You don't have any reading activity for this book."
msgstr "你还没有任何这本书的阅读活动。"
-#: bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:177
msgid "Create"
msgstr "创建"
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr "主题"
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr "地点"
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr "列表"
-
-#: bookwyrm/templates/book/book.html:231
-msgid "Add to list"
-msgstr "添加到列表"
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr "添加"
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
#, fuzzy
#| msgid "Review"
msgid "Reviews"
msgstr "书评"
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
#, fuzzy
#| msgid "Your shelves"
msgid "Your reviews"
msgstr "你的书架"
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
#, fuzzy
#| msgid "Your Account"
msgid "Your comments"
msgstr "你的帐号"
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
#, fuzzy
#| msgid "Your books"
msgid "Your quotes"
msgstr "你的书目"
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
msgid "rated it"
msgstr "评价了"
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr "主题"
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr "地点"
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr "列表"
+
+#: bookwyrm/templates/book/book.html:310
+msgid "Add to list"
+msgstr "添加到列表"
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr "添加"
+
#: bookwyrm/templates/book/book_identifiers.html:8
msgid "ISBN:"
msgstr "ISBN:"
#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
msgid "OCLC Number:"
msgstr "OCLC 号:"
#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
msgid "ASIN:"
msgstr "ASIN:"
#: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
msgid "Upload cover:"
msgstr "上传封面:"
#: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
msgid "Load cover from url:"
msgstr "从网址加载封面:"
@@ -459,36 +461,36 @@ msgid "John Doe, Jane Smith"
msgstr "张三, 李四"
#: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
msgid "Cover"
msgstr "封面"
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
msgid "Physical Properties"
msgstr "实体性质"
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
#: bookwyrm/templates/book/format_filter.html:5
msgid "Format:"
msgstr "格式:"
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
msgid "Pages:"
msgstr "页数:"
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
msgid "Book Identifiers"
msgstr "书目标识号"
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
msgid "ISBN 13:"
msgstr "ISBN 13:"
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
msgid "ISBN 10:"
msgstr "ISBN 10:"
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
#: bookwyrm/templates/edit_author.html:59
msgid "Openlibrary key:"
msgstr "Openlibrary key:"
@@ -552,7 +554,7 @@ msgstr "由 %(publisher)s 出版。"
#: bookwyrm/templates/feed/feed_layout.html:70
#: bookwyrm/templates/get_started/layout.html:19
#: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
msgid "Close"
msgstr "关闭"
@@ -574,46 +576,28 @@ msgstr "本地用户"
msgid "Federated community"
msgstr "跨站社区"
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
#: bookwyrm/templates/layout.html:93
msgid "Directory"
msgstr "目录"
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
msgid "Make your profile discoverable to other BookWyrm users."
msgstr "使你的个人资料可以被其它 BookWyrm 用户发现。"
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
#, python-format
msgid ""
"You can opt-out at any time in your profile settings."
"a>"
msgstr "你可以在任何时候从你的 个人资料设定 中退出。"
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
#: bookwyrm/templates/snippets/goal_card.html:22
msgid "Dismiss message"
msgstr "遣散消息"
-#: bookwyrm/templates/directory/directory.html:71
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] "你关注的关注者"
-
-#: bookwyrm/templates/directory/directory.html:78
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] "你书架上的书"
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr "发文"
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr "最后活跃"
-
#: bookwyrm/templates/directory/sort_filter.html:5
msgid "Order by"
msgstr "排列顺序"
@@ -626,6 +610,24 @@ msgstr "受推荐"
msgid "Recently active"
msgstr "最近活跃"
+#: bookwyrm/templates/directory/user_card.html:32
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "你关注的关注者"
+
+#: bookwyrm/templates/directory/user_card.html:39
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "你书架上的书"
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr "发文"
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr "最后活跃"
+
#: bookwyrm/templates/directory/user_type_filter.html:5
msgid "User type"
msgstr "用户类型"
@@ -713,8 +715,8 @@ msgid "Edit Author:"
msgstr "编辑作者:"
#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
msgid "Name:"
msgstr "名称:"
@@ -886,7 +888,7 @@ msgstr "更新"
#: bookwyrm/templates/feed/feed_layout.html:11
#: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
msgid "Your books"
msgstr "你的书目"
@@ -896,18 +898,18 @@ msgid ""
msgstr "现在这里还没有任何书目!尝试着从搜索某本书开始吧"
#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "To Read"
msgstr "想读"
#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Currently Reading"
msgstr "在读"
#: bookwyrm/templates/feed/feed_layout.html:26
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
msgid "Read"
msgstr "读过"
@@ -939,13 +941,12 @@ msgid "What are you reading?"
msgstr "你在阅读什么?"
#: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
msgid "Search for a book"
msgstr "搜索书目"
#: bookwyrm/templates/get_started/books.html:11
#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
#, python-format
msgid "No books found for \"%(query)s\""
msgstr "没有找到 \"%(query)s\" 的书目"
@@ -960,25 +961,27 @@ msgstr "你可以在开始使用 %(site_name)s 后添加书目。"
#: bookwyrm/templates/get_started/users.html:18
#: bookwyrm/templates/get_started/users.html:19
#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
msgid "Search"
msgstr "搜索"
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
msgid "Suggested Books"
msgstr "推荐的书目"
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
#, python-format
msgid "Popular on %(site_name)s"
msgstr "%(site_name)s 上的热门"
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
msgid "No books found"
msgstr "没有找到书目"
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
#: bookwyrm/templates/get_started/profile.html:54
msgid "Save & continue"
msgstr "保存 & 继续"
@@ -1053,7 +1056,6 @@ msgid "Search for a user"
msgstr "搜索用户"
#: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
#, python-format
msgid "No users found for \"%(query)s\""
msgstr "没有找到 \"%(query)s\" 的用户"
@@ -1173,18 +1175,19 @@ msgid "Successfully imported"
msgstr "成功导入了"
#: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
msgid "Book"
msgstr "书目"
#: bookwyrm/templates/import_status.html:115
#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
msgid "Title"
msgstr "标题"
#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
msgid "Author"
msgstr "作者"
@@ -1206,18 +1209,15 @@ msgid "Sorry! This invite code is no longer valid."
msgstr "抱歉!此邀请码已不再有效。"
#: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
msgid "Search Results"
msgstr "搜索结果"
#: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
#, python-format
msgid "Search Results for \"%(query)s\""
msgstr "\"%(query)s\" 的搜索结果"
#: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
msgid "Matching Books"
msgstr "匹配的书目"
@@ -1259,38 +1259,44 @@ msgstr "登出"
msgid "Notifications"
msgstr "通知"
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
#: bookwyrm/templates/login.html:17
#: bookwyrm/templates/snippets/register_form.html:4
msgid "Username:"
msgstr "用户名:"
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
msgid "password"
msgstr "密码"
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
msgid "Forgot your password?"
msgstr "忘记了密码?"
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
#: bookwyrm/templates/login.html:33
msgid "Log in"
msgstr "登录"
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
msgid "Join"
msgstr "加入"
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
msgid "About this server"
msgstr "关于本服务器"
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
msgid "Contact site admin"
msgstr "联系站点管理员"
#: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "List curation:"
+msgid "Documentation"
+msgstr "列表策展:"
+
+#: bookwyrm/templates/layout.html:213
#, python-format
msgid ""
"Support %(site_name)s on "
@@ -1299,7 +1305,7 @@ msgstr ""
"在 %(support_title)s 上支"
"持 %(site_name)s"
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
msgid ""
"BookWyrm is open source software. You can contribute or report issues on GitHub ."
@@ -1322,27 +1328,27 @@ msgstr "由 %(username)s 创建并策展"
msgid "Created by %(username)s "
msgstr "由 %(username)s 创建"
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
msgid "Pending Books"
msgstr "等候中的书目"
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
msgid "Go to list"
msgstr "前往列表"
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
msgid "You're all set!"
msgstr "都弄好了!"
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
msgid "Suggested by"
msgstr "推荐来自"
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
msgid "Approve"
msgstr "批准"
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
msgid "Discard"
msgstr "削除"
@@ -1394,62 +1400,62 @@ msgstr "任何人都可以向此列表中添加书目"
msgid "This list is currently empty"
msgstr "此列表当前是空的"
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
#, python-format
msgid "Added by %(username)s "
msgstr "由 %(username)s 添加"
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
#, fuzzy
#| msgid "Sent"
msgid "Set"
msgstr "已发送"
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
#, fuzzy
#| msgid "List curation:"
msgid "List position"
msgstr "列表策展:"
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
#: bookwyrm/templates/snippets/shelf_selector.html:26
msgid "Remove"
msgstr "移除"
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
#, fuzzy
#| msgid "Your Lists"
msgid "Sort List"
msgstr "你的列表"
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
#, fuzzy
#| msgid "Directory"
msgid "Direction"
msgstr "目录"
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Add Books"
msgstr "添加书目"
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
msgid "Suggest Books"
msgstr "推荐书目"
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
msgid "search"
msgstr "搜索"
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
msgid "Clear search"
msgstr "清除搜索"
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
#, python-format
msgid "No books found matching the query \"%(query)s\""
msgstr "没有符合 \"%(query)s\" 请求的书目"
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
msgid "Suggest"
msgstr "推荐"
@@ -1802,35 +1808,52 @@ msgstr "个人资料"
msgid "Relationships"
msgstr "关系"
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr "没有找到你想找的?"
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr "显示其它类别的结果"
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr "隐藏其它类别的结果"
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
#, fuzzy
#| msgid "Show more"
msgid "Show"
msgstr "显示更多"
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
-msgstr "匹配的用户"
+#: bookwyrm/templates/search/book.html:64
+#, fuzzy
+#| msgid "Show results from other catalogues"
+msgid "Load results from other catalogues"
+msgstr "显示其它类别的结果"
-#: bookwyrm/templates/search_results.html:117
-#, python-format
-msgid "No lists found for \"%(query)s\""
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+#, fuzzy
+#| msgid "Search for a user"
+msgid "Search query"
+msgstr "搜索用户"
+
+#: bookwyrm/templates/search/layout.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search type"
+msgstr "搜索"
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+msgid "Books"
+msgstr "书目"
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr "用户"
+
+#: bookwyrm/templates/search/layout.html:58
+#, fuzzy, python-format
+#| msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
msgstr "没有找到 \"%(query)s\" 的列表"
#: bookwyrm/templates/settings/admin_layout.html:4
@@ -1841,12 +1864,6 @@ msgstr "管理"
msgid "Manage Users"
msgstr "管理用户"
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr "用户"
-
#: bookwyrm/templates/settings/admin_layout.html:39
#: bookwyrm/templates/settings/federation.html:3
#: bookwyrm/templates/settings/federation.html:5
@@ -1879,7 +1896,7 @@ msgid "Footer Content"
msgstr "页脚内容"
#: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
msgid "Registration"
msgstr "注册"
@@ -1948,7 +1965,7 @@ msgid "Details"
msgstr "详细"
#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
msgid "Activity"
msgstr "活动"
@@ -2206,20 +2223,23 @@ msgstr "支持标题:"
msgid "Admin email:"
msgstr "管理员邮件:"
-#: bookwyrm/templates/settings/site.html:79
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
msgid "Allow registration:"
msgstr "允许注册:"
-#: bookwyrm/templates/settings/site.html:83
+#: bookwyrm/templates/settings/site.html:87
msgid "Allow invite requests:"
msgstr "允许请求邀请:"
-#: bookwyrm/templates/settings/site.html:87
+#: bookwyrm/templates/settings/site.html:91
msgid "Registration closed text:"
msgstr "注册关闭文字:"
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
msgid "No cover"
msgstr "没有封面"
@@ -2503,7 +2523,8 @@ msgid "Post privacy"
msgstr "发文隐私"
#: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
msgid "Followers"
msgstr "关注者"
@@ -2531,16 +2552,16 @@ msgstr "显示所有更新"
msgid "Delete this progress update"
msgstr "删除此进度更新"
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
msgid "started"
msgstr "已开始"
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
msgid "Edit read dates"
msgstr "编辑阅读日期"
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
msgid "Delete these read dates"
msgstr "删除这些阅读日期"
@@ -2587,7 +2608,7 @@ msgstr "评论了"
msgid "quoted"
msgstr "引用了"
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
msgid "Import book"
msgstr "导入书目"
@@ -2637,17 +2658,17 @@ msgstr "开始 \"%(book_title)s \""
msgid "Want to Read \"%(book_title)s \""
msgstr "想要阅读 \"%(book_title)s \""
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
#: bookwyrm/templates/snippets/trimmed_text.html:14
msgid "Show more"
msgstr "显示更多"
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
#: bookwyrm/templates/snippets/trimmed_text.html:29
msgid "Show less"
msgstr "显示更少"
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
msgid "Open image in new window"
msgstr "在新窗口中打开图像"
@@ -2708,43 +2729,17 @@ msgstr "升序排序"
msgid "Sorted descending"
msgstr "降序排序"
-#: bookwyrm/templates/user/books_header.html:5
-#, python-format
-msgid "%(username)s's books"
-msgstr "%(username)s 的书目"
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create Shelf"
-msgstr "创建书架"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr "编辑书架"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr "更新书架"
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "用户个人资料"
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
-msgstr "%(username)s 没有关注者"
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
+msgstr "关注请求"
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr "正在关注"
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr "%(username)s 没有关注任何用户"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
+msgstr "阅读目标"
#: bookwyrm/templates/user/lists.html:11
#, python-format
@@ -2755,35 +2750,71 @@ msgstr "列表: %(username)s"
msgid "Create list"
msgstr "创建列表"
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "%(username)s 没有关注者"
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr "正在关注"
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s 没有关注任何用户"
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr "%(username)s 的书目"
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr "创建书架"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "编辑书架"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "更新书架"
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
msgid "All books"
msgstr "所有书目"
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
msgid "Create shelf"
msgstr "创建书架"
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
msgid "Edit shelf"
msgstr "编辑书架"
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
msgid "Shelved"
msgstr "上架时间"
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
msgid "Started"
msgstr "开始时间"
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
msgid "Finished"
msgstr "完成时间"
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
msgid "This shelf is empty."
msgstr "此书架是空的。"
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
msgid "Delete shelf"
msgstr "删除书架"
@@ -2800,51 +2831,42 @@ msgstr "查看所有 %(size)s 本"
msgid "View all books"
msgstr "查看所有书目"
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr "设定 %(year)s 的阅读目标"
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
msgid "User Activity"
msgstr "用户活动"
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
msgid "RSS feed"
msgstr "RSS 流"
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
msgid "No activities yet!"
msgstr "还没有活动!"
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-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
+#: bookwyrm/templates/user/user_preview.html:14
#, python-format
msgid "Joined %(date)s"
msgstr "在 %(date)s 加入"
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
#, python-format
msgid "%(counter)s follower"
msgid_plural "%(counter)s followers"
msgstr[0] "%(counter)s 个关注者"
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
#, python-format
msgid "%(counter)s following"
msgstr "关注着 %(counter)s 人"
+#: bookwyrm/templates/user/user_preview.html:25
+#, fuzzy, python-format
+#| msgid "%(mutuals)s follower you follow"
+#| msgid_plural "%(mutuals)s followers you follow"
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] "%(mutuals)s 个你也关注的关注者"
+
#: bookwyrm/templates/user_admin/user.html:11
#, fuzzy
#| msgid "Back to reports"
@@ -4304,6 +4326,19 @@ msgctxt "stick"
msgid "club"
msgstr ""
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "没有找到你想找的?"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "隐藏其它类别的结果"
+
+#~ msgid "Matching Users"
+#~ msgstr "匹配的用户"
+
+#, python-format
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "设定 %(year)s 的阅读目标"
+
#, python-format
#~ msgid "by %(author)s"
#~ msgstr "由 %(author)s 所著"