diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py index c0f4a9233..1477234fe 100644 --- a/bookwyrm/forms.py +++ b/bookwyrm/forms.py @@ -137,6 +137,19 @@ class EditUserForm(CustomForm): help_texts = {f: None for f in fields} +class LimitedEditUserForm(CustomForm): + class Meta: + model = models.User + fields = [ + "avatar", + "name", + "summary", + "manually_approves_followers", + "discoverable", + ] + help_texts = {f: None for f in fields} + + class TagForm(CustomForm): class Meta: model = models.Tag diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css index 65fd56aba..e3ae1ce79 100644 --- a/bookwyrm/static/css/format.css +++ b/bookwyrm/static/css/format.css @@ -21,6 +21,10 @@ html { overflow-x: auto; } +.modal-card.is-fullwidth { + min-width: 75% !important; +} + /* --- SHELVING --- */ /** @todo Replace icons with SVG symbols. diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 3931ea5bf..b91cebbac 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -49,6 +49,9 @@ {% trans "Add cover" as button_text %} {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="add-cover" controls_uid=book.id focus="modal-title-add-cover" class="is-small" %} {% include 'book/cover_modal.html' with book=book controls_text="add-cover" controls_uid=book.id %} + {% if request.GET.cover_error %} +

{% trans "Failed to load cover" %}

+ {% endif %} {% endif %} diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html index 3f9d36f76..e49b4c138 100644 --- a/bookwyrm/templates/feed/feed.html +++ b/bookwyrm/templates/feed/feed.html @@ -54,27 +54,7 @@ {# suggested users on the first page, two statuses down #}

{% trans "Who to follow" %}

-
- {% for user in suggested_users %} -
-
- - {% include 'snippets/avatar.html' with user=user large=True %} - {{ user.display_name|truncatechars:10 }} - @{{ user|username|truncatechars:8 }} - - {% include 'snippets/follow_button.html' with user=user minimal=True %} - {% if user.mutuals %} -

- {% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %} -

- {% elif user.shared_books %} -

{% blocktrans with shared_books=user.shared_books|intcomma count counter=user.shared_books %}{{ shared_books }} book on your shelves{% plural %}{{ shared_books }} books on your shelves{% endblocktrans %}

- {% endif %} -
-
- {% endfor %} -
+ {% include 'feed/suggested_users.html' with suggested_users=suggested_users %} View directory
{% endif %} diff --git a/bookwyrm/templates/feed/suggested_users.html b/bookwyrm/templates/feed/suggested_users.html new file mode 100644 index 000000000..f66662e87 --- /dev/null +++ b/bookwyrm/templates/feed/suggested_users.html @@ -0,0 +1,25 @@ +{% load i18n %} +{% load bookwyrm_tags %} +{% load humanize %} +
+ {% for user in suggested_users %} +
+
+ + {% include 'snippets/avatar.html' with user=user large=True %} + {{ user.display_name|truncatechars:10 }} + @{{ user|username|truncatechars:8 }} + + {% include 'snippets/follow_button.html' with user=user minimal=True %} + {% if user.mutuals %} +

+ {% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %} +

+ {% elif user.shared_books %} +

{% blocktrans with shared_books=user.shared_books|intcomma count counter=user.shared_books %}{{ shared_books }} book on your shelves{% plural %}{{ shared_books }} books on your shelves{% endblocktrans %}

+ {% endif %} +
+
+ {% endfor %} +
+ diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html new file mode 100644 index 000000000..04d0c424d --- /dev/null +++ b/bookwyrm/templates/get_started/book_preview.html @@ -0,0 +1,14 @@ +{% load i18n %} +
+ {% include 'snippets/book_cover.html' with book=book %} +
+ diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html new file mode 100644 index 000000000..06f87c3a1 --- /dev/null +++ b/bookwyrm/templates/get_started/books.html @@ -0,0 +1,57 @@ +{% extends 'get_started/layout.html' %} +{% load i18n %} + +{% block panel %} +
+

{% trans "What are you reading?" %}

+
+
+ + {% if request.GET.query and not book_results %} +

{% blocktrans with query=request.GET.query %}No books found for "{{ query }}"{% endblocktrans %}. {% blocktrans %}You can add books when you start using {{ site_name }}.{% endblocktrans %}

+ {% endif %} +
+
+ +
+
+
+ +
+ {% csrf_token %} +

{% trans "Suggested Books" %}

+
+ {% if book_results %} +
+

Search results

+
+ {% for book in book_results %} + {% include 'get_started/book_preview.html' %} + {% endfor %} +
+
+ {% endif %} + {% if popular_books %} +
+

+ {% blocktrans %}Popular on {{ site_name }}{% endblocktrans %} +

+
+ {% for book in popular_books %} + {% include 'get_started/book_preview.html' %} + {% endfor %} +
+
+ {% endif %} + {% if not book_results and not popular_books %} +

{% trans "No books found" %}

+ {% endif %} +
+ +
+{% endblock %} + diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html new file mode 100644 index 000000000..0e80a5021 --- /dev/null +++ b/bookwyrm/templates/get_started/layout.html @@ -0,0 +1,53 @@ +{% extends 'layout.html' %} +{% load i18n %} + +{% block title %}{% trans "Welcome" %}{% endblock %} + +{% block content %} +{% with site_name=site.name %} + +{% endwith %} +{% endblock %} + + diff --git a/bookwyrm/templates/get_started/profile.html b/bookwyrm/templates/get_started/profile.html new file mode 100644 index 000000000..b26bd9150 --- /dev/null +++ b/bookwyrm/templates/get_started/profile.html @@ -0,0 +1,58 @@ +{% extends 'get_started/layout.html' %} +{% load i18n %} + +{% block panel %} +
+

{% trans "Create your profile" %}

+ {% if form.non_field_errors %} +

{{ form.non_field_errors }}

+ {% endif %} +
+ {% csrf_token %} +
+
+
+ + + {% for error in form.name.errors %} +

{{ error | escape }}

+ {% endfor %} +
+
+ + + {% for error in form.summary.errors %} +

{{ error | escape }}

+ {% endfor %} +
+
+ +
+
+ + {{ form.avatar }} + {% for error in form.avatar.errors %} +

{{ error | escape }}

+ {% endfor %} +
+
+
+
+ +
+
+ + {% url 'directory' as path %} +

{% trans "Your account will show up in the directory, and may be recommended to other BookWyrm users." %}

+
+
+
+
+{% endblock %} + diff --git a/bookwyrm/templates/get_started/users.html b/bookwyrm/templates/get_started/users.html new file mode 100644 index 000000000..259f06d34 --- /dev/null +++ b/bookwyrm/templates/get_started/users.html @@ -0,0 +1,28 @@ +{% extends 'get_started/layout.html' %} +{% load i18n %} + +{% block panel %} +
+

{% trans "Who to follow" %}

+ +

You can follow users on other BookWyrm instances and federated services like Mastodon.

+
+
+ + {% if request.GET.query and not user_results %} +

{% blocktrans with query=request.GET.query %}No users found for "{{ query }}"{% endblocktrans %}

+ {% endif %} +
+
+ +
+
+ + {% include 'feed/suggested_users.html' with suggested_users=suggested_users %} +
+{% endblock %} + diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py new file mode 100644 index 000000000..71eb4060f --- /dev/null +++ b/bookwyrm/tests/views/test_get_started.py @@ -0,0 +1,127 @@ +""" test for app action functionality """ +from unittest.mock import patch +from django.template.response import TemplateResponse +from django.test import TestCase +from django.test.client import RequestFactory + +from bookwyrm import forms, models, views + + +class GetStartedViews(TestCase): + """ helping new users get oriented """ + + def setUp(self): + """ we need basic test data and mocks """ + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.book = models.Edition.objects.create( + parent_work=models.Work.objects.create(title="hi"), + title="Example Edition", + remote_id="https://example.com/book/1", + ) + models.Connector.objects.create( + identifier="self", connector_file="self_connector", local=True + ) + models.SiteSettings.objects.create() + + def test_profile_view(self): + """ there are so many views, this just makes sure it LOADS """ + view = views.GetStartedProfile.as_view() + request = self.factory.get("") + request.user = self.local_user + + result = view(request) + + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + + def test_profile_view_post(self): + """ save basic user details """ + view = views.GetStartedProfile.as_view() + form = forms.LimitedEditUserForm(instance=self.local_user) + form.data["name"] = "New Name" + form.data["discoverable"] = "True" + request = self.factory.post("", form.data) + request.user = self.local_user + + self.assertIsNone(self.local_user.name) + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) + self.assertEqual(self.local_user.name, "New Name") + self.assertTrue(self.local_user.discoverable) + + def test_books_view(self): + """ there are so many views, this just makes sure it LOADS """ + view = views.GetStartedBooks.as_view() + request = self.factory.get("") + request.user = self.local_user + + result = view(request) + + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + + def test_books_view_with_query(self): + """ there are so many views, this just makes sure it LOADS """ + view = views.GetStartedBooks.as_view() + request = self.factory.get("?query=Example") + request.user = self.local_user + + result = view(request) + + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + + def test_books_view_post(self): + """ shelve some books """ + view = views.GetStartedBooks.as_view() + data = {self.book.id: self.local_user.shelf_set.first().id} + request = self.factory.post("", data) + request.user = self.local_user + + self.assertFalse(self.local_user.shelfbook_set.exists()) + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) + + shelfbook = self.local_user.shelfbook_set.first() + self.assertEqual(shelfbook.book, self.book) + self.assertEqual(shelfbook.user, self.local_user) + + def test_users_view(self): + """ there are so many views, this just makes sure it LOADS """ + view = views.GetStartedUsers.as_view() + request = self.factory.get("") + request.user = self.local_user + + result = view(request) + + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + + def test_users_view_with_query(self): + """ there are so many views, this just makes sure it LOADS """ + view = views.GetStartedUsers.as_view() + request = self.factory.get("?query=rat") + request.user = self.local_user + + result = view(request) + + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 27fb678fa..2b874eb9c 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -109,6 +109,22 @@ urlpatterns = [ re_path(r"^discover/?$", views.Discover.as_view()), re_path(r"^notifications/?$", views.Notifications.as_view()), re_path(r"^directory/?", views.Directory.as_view(), name="directory"), + # Get started + re_path( + r"^get-started/profile/?$", + views.GetStartedProfile.as_view(), + name="get-started-profile", + ), + re_path( + r"^get-started/books/?$", + views.GetStartedBooks.as_view(), + name="get-started-books", + ), + re_path( + r"^get-started/users/?$", + views.GetStartedUsers.as_view(), + name="get-started-users", + ), # feeds re_path(r"^(?Phome|local|federated)/?$", views.Feed.as_view()), re_path( diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index fead2a32b..22e6071c7 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -9,6 +9,7 @@ from .federation import Federation, FederatedServer from .feed import DirectMessage, Feed, Replies, Status from .follow import follow, unfollow from .follow import accept_follow_request, delete_follow_request +from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers from .goal import Goal, hide_goal from .import_data import Import, ImportStatus from .inbox import Inbox diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py index 632cb2ad9..58886cade 100644 --- a/bookwyrm/views/books.py +++ b/bookwyrm/views/books.py @@ -289,18 +289,19 @@ def upload_cover(request, book_id): url = request.POST.get("cover-url") if url: image = set_cover_from_url(url) - book.cover.save(*image) + if image: + book.cover.save(*image) - return redirect("/book/%d" % book.id) + return redirect("{:s}?cover_error=True".format(book.local_path)) form = forms.CoverForm(request.POST, request.FILES, instance=book) if not form.is_valid() or not form.files.get("cover"): - return redirect("/book/%d" % book.id) + return redirect(book.local_path) book.cover = form.files["cover"] book.save() - return redirect("/book/%s" % book.id) + return redirect(book.local_path) def set_cover_from_url(url): diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py new file mode 100644 index 000000000..e64333dfa --- /dev/null +++ b/bookwyrm/views/get_started.py @@ -0,0 +1,137 @@ +""" Helping new users figure out the lay of the land """ +import re + +from django.contrib.auth.decorators import login_required +from django.contrib.postgres.search import TrigramSimilarity +from django.db.models.functions import Greatest +from django.db.models import Count, Q +from django.http import HttpResponseNotFound +from django.shortcuts import get_object_or_404, redirect +from django.template.response import TemplateResponse +from django.utils.decorators import method_decorator +from django.views import View + +from bookwyrm import forms, models +from bookwyrm.connectors import connector_manager +from .helpers import get_suggested_users +from .user import save_user_form + + +# pylint: disable= no-self-use +@method_decorator(login_required, name="dispatch") +class GetStartedProfile(View): + """ tell us about yourself """ + + next_view = "get-started-books" + + def get(self, request): + """ basic profile info """ + data = { + "form": forms.LimitedEditUserForm(instance=request.user), + "next": self.next_view, + } + return TemplateResponse(request, "get_started/profile.html", data) + + def post(self, request): + """ update your profile """ + form = forms.LimitedEditUserForm( + request.POST, request.FILES, instance=request.user + ) + if not form.is_valid(): + data = {"form": form, "next": "get-started-books"} + return TemplateResponse(request, "get_started/profile.html", data) + save_user_form(form) + return redirect(self.next_view) + + +@method_decorator(login_required, name="dispatch") +class GetStartedBooks(View): + """ name a book, any book, we gotta start somewhere """ + + next_view = "get-started-users" + + def get(self, request): + """ info about a book """ + query = request.GET.get("query") + book_results = [] + if query: + book_results = connector_manager.local_search(query, raw=True)[:5] + if len(book_results) < 5: + popular_books = ( + models.Edition.objects.exclude( + # exclude already shelved + Q( + parent_work__in=[ + b.book.parent_work + for b in request.user.shelfbook_set.distinct().all() + ] + ) + | Q( # and exclude if it's already in search results + parent_work__in=[b.parent_work for b in book_results] + ) + ) + .annotate(Count("shelfbook")) + .order_by("-shelfbook__count")[: 5 - len(book_results)] + ) + + data = { + "book_results": book_results, + "popular_books": popular_books, + "next": self.next_view, + } + return TemplateResponse(request, "get_started/books.html", data) + + def post(self, request): + """ shelve some books """ + shelve_actions = [ + (k, v) + for k, v in request.POST.items() + if re.match(r"\d+", k) and re.match(r"\d+", v) + ] + for (book_id, shelf_id) in shelve_actions: + book = get_object_or_404(models.Edition, id=book_id) + shelf = get_object_or_404(models.Shelf, id=shelf_id) + if shelf.user != request.user: + # hmmmmm + return HttpResponseNotFound() + models.ShelfBook.objects.create(book=book, shelf=shelf, user=request.user) + return redirect(self.next_view) + + +@method_decorator(login_required, name="dispatch") +class GetStartedUsers(View): + """ find friends """ + + def get(self, request): + """ basic profile info """ + query = request.GET.get("query") + 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")[:5] + ) + + if user_results.count() < 5: + suggested_users = ( + get_suggested_users( + request.user, + ~Q(id=request.user.id), + ~Q(followers=request.user), + ~Q(id__in=user_results), + bookwyrm_user=True, + ) + .order_by("shared_books", "-mutuals", "-last_active_date") + .all()[: 5 - user_results.count()] + ) + data = { + "suggested_users": list(user_results) + list(suggested_users), + } + return TemplateResponse(request, "get_started/users.html", data) diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 88982b26e..41d1f1358 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -39,7 +39,10 @@ class Shelf(View): # get the shelf and make sure the logged in user should be able to see it if shelf_identifier: - shelf = user.shelf_set.get(identifier=shelf_identifier) + try: + shelf = user.shelf_set.get(identifier=shelf_identifier) + except models.Shelf.DoesNotExist: + return HttpResponseNotFound() if not object_visible_to_user(request.user, shelf): return HttpResponseNotFound() # this is a constructed "all books" view, with a fake "shelf" obj diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index b8e3a86d2..aba804d8b 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -163,22 +163,28 @@ class EditUser(View): data = {"form": form, "user": request.user} return TemplateResponse(request, "preferences/edit_user.html", data) - user = form.save(commit=False) - - if "avatar" in form.files: - # crop and resize avatar upload - image = Image.open(form.files["avatar"]) - image = crop_avatar(image) - - # set the name to a hash - extension = form.files["avatar"].name.split(".")[-1] - filename = "%s.%s" % (uuid4(), extension) - user.avatar.save(filename, image, save=False) - user.save() + user = save_user_form(form) return redirect(user.local_path) +def save_user_form(form): + """ special handling for the user form """ + user = form.save(commit=False) + + if "avatar" in form.files: + # crop and resize avatar upload + image = Image.open(form.files["avatar"]) + image = crop_avatar(image) + + # set the name to a hash + extension = form.files["avatar"].name.split(".")[-1] + filename = "%s.%s" % (uuid4(), extension) + user.avatar.save(filename, image, save=False) + user.save() + return user + + def crop_avatar(image): """ reduce the size and make an avatar square """ target_size = 120 diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index adec14217..7b418998e 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-31 10:36-0700\n" +"POT-Creation-Date: 2021-04-01 12:22-0700\n" "PO-Revision-Date: 2021-03-02 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,34 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:213 +#: bookwyrm/forms.py:226 #, fuzzy #| msgid "A user with that username already exists." msgid "A user with this email already exists." msgstr "Dieser Benutzename ist bereits vergeben." -#: bookwyrm/forms.py:227 +#: bookwyrm/forms.py:240 msgid "One Day" msgstr "Ein Tag" -#: bookwyrm/forms.py:228 +#: bookwyrm/forms.py:241 msgid "One Week" msgstr "Eine Woche" -#: bookwyrm/forms.py:229 +#: bookwyrm/forms.py:242 msgid "One Month" msgstr "Ein Monat" -#: bookwyrm/forms.py:230 +#: bookwyrm/forms.py:243 msgid "Does Not Expire" msgstr "Läuft nicht aus" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:248 #, python-format msgid "%(count)d uses" msgstr "%(count)d Benutzungen" -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:251 #, fuzzy #| msgid "Unlisted" msgid "Unlimited" @@ -137,42 +137,48 @@ msgstr "Buch editieren" msgid "Add cover" msgstr "Cover hinzufügen" -#: bookwyrm/templates/book/book.html:59 +#: bookwyrm/templates/book/book.html:53 +#, fuzzy +#| msgid "Failed to load" +msgid "Failed to load cover" +msgstr "Laden fehlgeschlagen" + +#: bookwyrm/templates/book/book.html:62 msgid "ISBN:" msgstr "" -#: bookwyrm/templates/book/book.html:66 +#: bookwyrm/templates/book/book.html:69 #: bookwyrm/templates/book/edit_book.html:211 msgid "OCLC Number:" msgstr "OCLC Nummer:" -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:76 #: bookwyrm/templates/book/edit_book.html:215 msgid "ASIN:" msgstr "" -#: bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:85 msgid "View on OpenLibrary" msgstr "In OpenLibrary ansehen" -#: bookwyrm/templates/book/book.html:91 +#: bookwyrm/templates/book/book.html:94 #, 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:97 +#: bookwyrm/templates/book/book.html:100 msgid "Add Description" msgstr "Beschreibung hinzufügen" -#: bookwyrm/templates/book/book.html:104 +#: bookwyrm/templates/book/book.html:107 #: bookwyrm/templates/book/edit_book.html:101 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Beschreibung:" -#: bookwyrm/templates/book/book.html:108 +#: bookwyrm/templates/book/book.html:111 #: bookwyrm/templates/book/edit_book.html:225 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -184,7 +190,7 @@ msgstr "Beschreibung:" msgid "Save" msgstr "Speichern" -#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:226 #: bookwyrm/templates/edit_author.html:79 @@ -199,77 +205,68 @@ msgstr "Speichern" msgid "Cancel" msgstr "Abbrechen" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:121 #, fuzzy, python-format #| msgid "%(title)s by " msgid "%(count)s editions" msgstr "%(title)s von" -#: bookwyrm/templates/book/book.html:126 +#: bookwyrm/templates/book/book.html:129 #, 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:132 +#: bookwyrm/templates/book/book.html:135 #, fuzzy, python-format #| msgid " added %(book_title)s to your list \"%(list_name)s\"" msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "hat %(book_title)s zu deiner Liste \"%(list_name)s\" Hinzugefügt" -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:144 msgid "Your reading activity" msgstr "Deine Leseaktivität" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 msgid "Add read dates" msgstr "Lesedaten hinzufügen" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:151 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:155 +#: bookwyrm/templates/book/book.html:158 msgid "Create" msgstr "Erstellen" -#: bookwyrm/templates/book/book.html:177 -msgid "Tags" -msgstr "" - -#: bookwyrm/templates/book/book.html:181 -#: bookwyrm/templates/snippets/tag.html:18 -msgid "Add tag" -msgstr "Tag hinzufügen" - -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:180 msgid "Subjects" msgstr "Themen" -#: bookwyrm/templates/book/book.html:209 +#: bookwyrm/templates/book/book.html:191 msgid "Places" msgstr "Orte" -#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "Listen" -#: bookwyrm/templates/book/book.html:231 +#: bookwyrm/templates/book/book.html:213 #, fuzzy #| msgid "Go to list" msgid "Add to list" msgstr "Zur Liste" -#: bookwyrm/templates/book/book.html:241 +#: bookwyrm/templates/book/book.html:223 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:90 msgid "Add" msgstr "Hinzufügen" -#: bookwyrm/templates/book/book.html:269 +#: bookwyrm/templates/book/book.html:251 msgid "rated it" msgstr "bewertet" @@ -505,6 +502,8 @@ msgstr "Veröffentlicht von %(publisher)s." #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/feed/feed_layout.html:57 +#: bookwyrm/templates/get_started/layout.html:15 +#: bookwyrm/templates/get_started/layout.html:48 msgid "Close" msgstr "Schließen" @@ -619,6 +618,7 @@ msgid "Recent Books" msgstr "Aktive Bücher" #: bookwyrm/templates/discover/landing_layout.html:5 +#: bookwyrm/templates/get_started/layout.html:4 msgid "Welcome" msgstr "Willkommen" @@ -828,23 +828,10 @@ msgid "There aren't any activities right now! Try following a user to get starte msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen" #: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/get_started/users.html:6 msgid "Who to follow" msgstr "" -#: bookwyrm/templates/feed/feed.html:69 -#, python-format -msgid "%(mutuals)s follower you follow" -msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "" -msgstr[1] "" - -#: bookwyrm/templates/feed/feed.html:72 -#, python-format -msgid "%(shared_books)s book on your shelves" -msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "" -msgstr[1] "" - #: bookwyrm/templates/feed/feed_layout.html:5 msgid "Updates" msgstr "" @@ -885,6 +872,160 @@ msgstr "Gelesen" msgid "%(year)s Reading Goal" msgstr "%(year)s Leseziel" +#: bookwyrm/templates/feed/suggested_users.html:16 +#, python-format +msgid "%(mutuals)s follower you follow" +msgid_plural "%(mutuals)s followers you follow" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/feed/suggested_users.html:19 +#, python-format +msgid "%(shared_books)s book on your shelves" +msgid_plural "%(shared_books)s books on your shelves" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/get_started/book_preview.html:6 +#, fuzzy, python-format +#| msgid "Want to Read \"%(book_title)s\"" +msgid "Have you read %(book_title)s?" +msgstr "\"%(book_title)s\" auf Leseliste setzen" + +#: bookwyrm/templates/get_started/books.html:6 +#, fuzzy +#| msgid "Started reading" +msgid "What are you reading?" +msgstr "Zu lesen angefangen" + +#: bookwyrm/templates/get_started/books.html:9 +#: bookwyrm/templates/lists/list.html:58 +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" + +#: bookwyrm/templates/get_started/books.html:11 +#, python-format +msgid "You can add books when you start using %(site_name)s." +msgstr "" + +#: bookwyrm/templates/get_started/books.html:16 +#: bookwyrm/templates/get_started/books.html:17 +#: bookwyrm/templates/get_started/users.html:18 +#: bookwyrm/templates/get_started/users.html:19 +#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/lists/list.html:62 +msgid "Search" +msgstr "Suche" + +#: bookwyrm/templates/get_started/books.html:26 +#, fuzzy +#| msgid "Suggest Books" +msgid "Suggested Books" +msgstr "Bücher vorschlagen" + +#: bookwyrm/templates/get_started/books.html:41 +#, 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:75 +msgid "No books found" +msgstr "Keine Bücher gefunden" + +#: bookwyrm/templates/get_started/books.html:54 +#: bookwyrm/templates/get_started/profile.html:54 +msgid "Save & continue" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:13 +#, fuzzy +#| msgid "Started" +msgid "Getting Started" +msgstr "Gestartet" + +#: bookwyrm/templates/get_started/layout.html:26 +#: bookwyrm/templates/get_started/profile.html:6 +#, fuzzy +#| msgid "User Profile" +msgid "Create your profile" +msgstr "Benutzerprofil" + +#: bookwyrm/templates/get_started/layout.html:30 +#, fuzzy +#| msgid "Add Books" +msgid "Add books" +msgstr "Bücher hinzufügen" + +#: bookwyrm/templates/get_started/layout.html:34 +#, fuzzy +#| msgid "Friendly" +msgid "Find friends" +msgstr "Freundlich" + +#: bookwyrm/templates/get_started/layout.html:40 +msgid "Skip this step" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:44 +#, fuzzy +#| msgid "Finished" +msgid "Finish" +msgstr "Abgeschlossen" + +#: bookwyrm/templates/get_started/profile.html:15 +#: bookwyrm/templates/preferences/edit_user.html:24 +msgid "Display name:" +msgstr "Displayname:" + +#: bookwyrm/templates/get_started/profile.html:22 +#: bookwyrm/templates/preferences/edit_user.html:31 +msgid "Summary:" +msgstr "Bio:" + +#: bookwyrm/templates/get_started/profile.html:23 +msgid "A little bit about you" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/preferences/edit_user.html:17 +msgid "Avatar:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:42 +#: bookwyrm/templates/preferences/edit_user.html:52 +msgid "Manually approve followers:" +msgstr "Folgende manuell bestätigen" + +#: bookwyrm/templates/get_started/profile.html:48 +#: bookwyrm/templates/preferences/edit_user.html:58 +msgid "Show this account in suggested users:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:52 +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." +msgstr "" + +#: bookwyrm/templates/get_started/users.html:11 +#, fuzzy +#| msgid "Search for a book or user" +msgid "Search for a user" +msgstr "Suche nach Buch oder Benutzer*in" + +#: bookwyrm/templates/get_started/users.html:13 +#: bookwyrm/templates/search_results.html:76 +#, python-format +msgid "No users found for \"%(query)s\"" +msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden" + #: bookwyrm/templates/goal.html:7 #, python-format msgid "%(year)s Reading Progress" @@ -1045,21 +1186,10 @@ msgstr "Suchergebnisse für \"%(query)s\"" msgid "Matching Books" msgstr "Passende Bücher" -#: 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" - #: bookwyrm/templates/layout.html:33 msgid "Search for a book or user" msgstr "Suche nach Buch oder Benutzer*in" -#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 -#: bookwyrm/templates/lists/list.html:62 -msgid "Search" -msgstr "Suche" - #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 msgid "Main navigation menu" msgstr "Navigationshauptmenü" @@ -1237,10 +1367,6 @@ msgstr "Bücher hinzufügen" msgid "Suggest Books" msgstr "Bücher vorschlagen" -#: bookwyrm/templates/lists/list.html:58 -msgid "Search for a book" -msgstr "Nach einem Buch suchen" - #: bookwyrm/templates/lists/list.html:63 msgid "search" msgstr "suchen" @@ -1254,10 +1380,6 @@ msgstr "Suche leeren" msgid "No books found matching the query \"%(query)s\"" msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden" -#: bookwyrm/templates/lists/list.html:75 -msgid "No books found" -msgstr "Keine Bücher gefunden" - #: bookwyrm/templates/lists/list.html:90 msgid "Suggest" msgstr "Vorschlagen" @@ -1562,30 +1684,10 @@ msgstr "Neues Passwort:" msgid "Edit Profile" msgstr "Profil bearbeiten:" -#: bookwyrm/templates/preferences/edit_user.html:17 -msgid "Avatar:" -msgstr "" - -#: bookwyrm/templates/preferences/edit_user.html:24 -msgid "Display name:" -msgstr "Displayname:" - -#: bookwyrm/templates/preferences/edit_user.html:31 -msgid "Summary:" -msgstr "Bio:" - #: bookwyrm/templates/preferences/edit_user.html:46 msgid "Show set reading goal prompt in feed:" msgstr "Angegebenes Leseziel im Feed anzeigen." -#: bookwyrm/templates/preferences/edit_user.html:52 -msgid "Manually approve followers:" -msgstr "Folgende manuell bestätigen" - -#: bookwyrm/templates/preferences/edit_user.html:58 -msgid "Show this account in suggested users:" -msgstr "" - #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." @@ -1619,11 +1721,6 @@ msgstr "Ergebnisse aus anderen Katalogen ausblenden" msgid "Matching Users" msgstr "Passende Nutzer*innen" -#: bookwyrm/templates/search_results.html:76 -#, python-format -msgid "No users found for \"%(query)s\"" -msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden" - #: bookwyrm/templates/search_results.html:93 #, python-format msgid "No lists found for \"%(query)s\"" @@ -2476,6 +2573,10 @@ msgstr "Zu lesen angefangen" msgid "Remove tag" msgstr "Tag entfernen" +#: bookwyrm/templates/snippets/tag.html:18 +msgid "Add tag" +msgstr "Tag hinzufügen" + #: bookwyrm/templates/tag.html:9 #, python-format msgid "Books tagged \"%(tag.name)s\"" @@ -2533,7 +2634,7 @@ msgstr "Listen: %(username)s" msgid "Create list" msgstr "Liste Erstellen" -#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53 +#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56 #, fuzzy #| msgid "books" msgid "All books" @@ -2559,11 +2660,11 @@ msgstr "Gestartet" msgid "Finished" msgstr "Abgeschlossen" -#: bookwyrm/templates/user/shelf.html:122 +#: bookwyrm/templates/user/shelf.html:127 msgid "This shelf is empty." msgstr "Dieses Regal ist leer." -#: bookwyrm/templates/user/shelf.html:128 +#: bookwyrm/templates/user/shelf.html:133 msgid "Delete shelf" msgstr "Regal löschen" @@ -2640,6 +2741,11 @@ msgstr "Dieser Benutzename ist bereits vergeben." msgid "A password reset link sent to %s" msgstr "" +#, fuzzy, python-format +#~| msgid "No users found for \"%(query)s\"" +#~ msgid "No users were found for \"%(query)s\"" +#~ msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden" + #~ msgid "Your shelves" #~ msgstr "Deine Regale" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index ff161897b..c605c877f 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-31 10:36-0700\n" +"POT-Creation-Date: 2021-04-01 12:22-0700\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,32 +18,32 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:213 +#: bookwyrm/forms.py:226 msgid "A user with this email already exists." msgstr "" -#: bookwyrm/forms.py:227 +#: bookwyrm/forms.py:240 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:228 +#: bookwyrm/forms.py:241 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:229 +#: bookwyrm/forms.py:242 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:230 +#: bookwyrm/forms.py:243 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:248 #, python-format msgid "%(count)d uses" msgstr "" -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:251 msgid "Unlimited" msgstr "" @@ -133,42 +133,46 @@ msgstr "" msgid "Add cover" msgstr "" -#: bookwyrm/templates/book/book.html:59 +#: bookwyrm/templates/book/book.html:53 +msgid "Failed to load cover" +msgstr "" + +#: bookwyrm/templates/book/book.html:62 msgid "ISBN:" msgstr "" -#: bookwyrm/templates/book/book.html:66 +#: bookwyrm/templates/book/book.html:69 #: bookwyrm/templates/book/edit_book.html:211 msgid "OCLC Number:" msgstr "" -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:76 #: bookwyrm/templates/book/edit_book.html:215 msgid "ASIN:" msgstr "" -#: bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:85 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/book/book.html:91 +#: bookwyrm/templates/book/book.html:94 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:97 +#: bookwyrm/templates/book/book.html:100 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:104 +#: bookwyrm/templates/book/book.html:107 #: bookwyrm/templates/book/edit_book.html:101 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:108 +#: bookwyrm/templates/book/book.html:111 #: bookwyrm/templates/book/edit_book.html:225 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -180,7 +184,7 @@ msgstr "" msgid "Save" msgstr "" -#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:226 #: bookwyrm/templates/edit_author.html:79 @@ -195,72 +199,63 @@ msgstr "" msgid "Cancel" msgstr "" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:121 #, python-format msgid "%(count)s editions" msgstr "" -#: bookwyrm/templates/book/book.html:126 +#: bookwyrm/templates/book/book.html:129 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:132 +#: bookwyrm/templates/book/book.html:135 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:144 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:151 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:155 +#: bookwyrm/templates/book/book.html:158 msgid "Create" msgstr "" -#: bookwyrm/templates/book/book.html:177 -msgid "Tags" -msgstr "" - -#: bookwyrm/templates/book/book.html:181 -#: bookwyrm/templates/snippets/tag.html:18 -msgid "Add tag" -msgstr "" - -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:180 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:209 +#: bookwyrm/templates/book/book.html:191 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:231 +#: bookwyrm/templates/book/book.html:213 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:241 +#: bookwyrm/templates/book/book.html:223 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:90 msgid "Add" msgstr "" -#: bookwyrm/templates/book/book.html:269 +#: bookwyrm/templates/book/book.html:251 msgid "rated it" msgstr "" @@ -481,6 +476,8 @@ msgstr "" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/feed/feed_layout.html:57 +#: bookwyrm/templates/get_started/layout.html:15 +#: bookwyrm/templates/get_started/layout.html:48 msgid "Close" msgstr "" @@ -580,6 +577,7 @@ msgid "Recent Books" msgstr "" #: bookwyrm/templates/discover/landing_layout.html:5 +#: bookwyrm/templates/get_started/layout.html:4 msgid "Welcome" msgstr "" @@ -781,23 +779,10 @@ msgid "There aren't any activities right now! Try following a user to get starte msgstr "" #: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/get_started/users.html:6 msgid "Who to follow" msgstr "" -#: bookwyrm/templates/feed/feed.html:69 -#, python-format -msgid "%(mutuals)s follower you follow" -msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "" -msgstr[1] "" - -#: bookwyrm/templates/feed/feed.html:72 -#, python-format -msgid "%(shared_books)s book on your shelves" -msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "" -msgstr[1] "" - #: bookwyrm/templates/feed/feed_layout.html:5 msgid "Updates" msgstr "" @@ -834,6 +819,142 @@ msgstr "" msgid "%(year)s Reading Goal" msgstr "" +#: bookwyrm/templates/feed/suggested_users.html:16 +#, python-format +msgid "%(mutuals)s follower you follow" +msgid_plural "%(mutuals)s followers you follow" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/feed/suggested_users.html:19 +#, python-format +msgid "%(shared_books)s book on your shelves" +msgid_plural "%(shared_books)s books on your shelves" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/get_started/book_preview.html:6 +#, python-format +msgid "Have you read %(book_title)s?" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:6 +msgid "What are you reading?" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:9 +#: bookwyrm/templates/lists/list.html:58 +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 "" + +#: bookwyrm/templates/get_started/books.html:11 +#, python-format +msgid "You can add books when you start using %(site_name)s." +msgstr "" + +#: bookwyrm/templates/get_started/books.html:16 +#: bookwyrm/templates/get_started/books.html:17 +#: bookwyrm/templates/get_started/users.html:18 +#: bookwyrm/templates/get_started/users.html:19 +#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/lists/list.html:62 +msgid "Search" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:26 +msgid "Suggested Books" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:41 +#, python-format +msgid "Popular on %(site_name)s" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:51 +#: bookwyrm/templates/lists/list.html:75 +msgid "No books found" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:54 +#: bookwyrm/templates/get_started/profile.html:54 +msgid "Save & continue" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:13 +msgid "Getting Started" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:26 +#: bookwyrm/templates/get_started/profile.html:6 +msgid "Create your profile" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:30 +msgid "Add books" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:34 +msgid "Find friends" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:40 +msgid "Skip this step" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:44 +msgid "Finish" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:15 +#: bookwyrm/templates/preferences/edit_user.html:24 +msgid "Display name:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:22 +#: bookwyrm/templates/preferences/edit_user.html:31 +msgid "Summary:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:23 +msgid "A little bit about you" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/preferences/edit_user.html:17 +msgid "Avatar:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:42 +#: bookwyrm/templates/preferences/edit_user.html:52 +msgid "Manually approve followers:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:48 +#: bookwyrm/templates/preferences/edit_user.html:58 +msgid "Show this account in suggested users:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:52 +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." +msgstr "" + +#: bookwyrm/templates/get_started/users.html:11 +msgid "Search for a user" +msgstr "" + +#: bookwyrm/templates/get_started/users.html:13 +#: bookwyrm/templates/search_results.html:76 +#, python-format +msgid "No users found for \"%(query)s\"" +msgstr "" + #: bookwyrm/templates/goal.html:7 #, python-format msgid "%(year)s Reading Progress" @@ -992,21 +1113,10 @@ msgstr "" msgid "Matching Books" msgstr "" -#: bookwyrm/templates/isbn_search_results.html:17 -#: bookwyrm/templates/search_results.html:17 -#, python-format -msgid "No books found for \"%(query)s\"" -msgstr "" - #: bookwyrm/templates/layout.html:33 msgid "Search for a book or user" msgstr "" -#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 -#: bookwyrm/templates/lists/list.html:62 -msgid "Search" -msgstr "" - #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 msgid "Main navigation menu" msgstr "" @@ -1181,10 +1291,6 @@ msgstr "" msgid "Suggest Books" msgstr "" -#: bookwyrm/templates/lists/list.html:58 -msgid "Search for a book" -msgstr "" - #: bookwyrm/templates/lists/list.html:63 msgid "search" msgstr "" @@ -1198,10 +1304,6 @@ msgstr "" msgid "No books found matching the query \"%(query)s\"" msgstr "" -#: bookwyrm/templates/lists/list.html:75 -msgid "No books found" -msgstr "" - #: bookwyrm/templates/lists/list.html:90 msgid "Suggest" msgstr "" @@ -1488,30 +1590,10 @@ msgstr "" msgid "Edit Profile" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:17 -msgid "Avatar:" -msgstr "" - -#: bookwyrm/templates/preferences/edit_user.html:24 -msgid "Display name:" -msgstr "" - -#: bookwyrm/templates/preferences/edit_user.html:31 -msgid "Summary:" -msgstr "" - #: bookwyrm/templates/preferences/edit_user.html:46 msgid "Show set reading goal prompt in feed:" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:52 -msgid "Manually approve followers:" -msgstr "" - -#: bookwyrm/templates/preferences/edit_user.html:58 -msgid "Show this account in suggested users:" -msgstr "" - #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." @@ -1545,11 +1627,6 @@ msgstr "" msgid "Matching Users" msgstr "" -#: bookwyrm/templates/search_results.html:76 -#, python-format -msgid "No users found for \"%(query)s\"" -msgstr "" - #: bookwyrm/templates/search_results.html:93 #, python-format msgid "No lists found for \"%(query)s\"" @@ -2336,6 +2413,10 @@ msgstr "" msgid "Remove tag" msgstr "" +#: bookwyrm/templates/snippets/tag.html:18 +msgid "Add tag" +msgstr "" + #: bookwyrm/templates/tag.html:9 #, python-format msgid "Books tagged \"%(tag.name)s\"" @@ -2392,7 +2473,7 @@ msgstr "" msgid "Create list" msgstr "" -#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53 +#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56 msgid "All books" msgstr "" @@ -2416,11 +2497,11 @@ msgstr "" msgid "Finished" msgstr "" -#: bookwyrm/templates/user/shelf.html:122 +#: bookwyrm/templates/user/shelf.html:127 msgid "This shelf is empty." msgstr "" -#: bookwyrm/templates/user/shelf.html:128 +#: bookwyrm/templates/user/shelf.html:133 msgid "Delete shelf" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo index d57846194..ea8eac7ee 100644 Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 922efe4c0..136d3cfe6 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-31 10:36-0700\n" +"POT-Creation-Date: 2021-04-01 12:22-0700\n" "PO-Revision-Date: 2021-03-19 11:49+0800\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,34 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:213 +#: bookwyrm/forms.py:226 #, fuzzy #| msgid "A user with that username already exists." msgid "A user with this email already exists." msgstr "Ya existe un usuario con ese nombre." -#: bookwyrm/forms.py:227 +#: bookwyrm/forms.py:240 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:228 +#: bookwyrm/forms.py:241 msgid "One Week" msgstr "Una semana" -#: bookwyrm/forms.py:229 +#: bookwyrm/forms.py:242 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:230 +#: bookwyrm/forms.py:243 msgid "Does Not Expire" msgstr "Nunca se vence" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:248 #, python-format msgid "%(count)d uses" msgstr "%(count)d usos" -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:251 msgid "Unlimited" msgstr "Sin límite" @@ -135,42 +135,48 @@ msgstr "Editar Libro" msgid "Add cover" msgstr "Agregar portada" -#: bookwyrm/templates/book/book.html:59 +#: bookwyrm/templates/book/book.html:53 +#, fuzzy +#| msgid "Failed to load" +msgid "Failed to load cover" +msgstr "Se falló a cargar" + +#: bookwyrm/templates/book/book.html:62 msgid "ISBN:" msgstr "ISBN:" -#: bookwyrm/templates/book/book.html:66 +#: bookwyrm/templates/book/book.html:69 #: bookwyrm/templates/book/edit_book.html:211 msgid "OCLC Number:" msgstr "Número OCLC:" -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:76 #: bookwyrm/templates/book/edit_book.html:215 msgid "ASIN:" msgstr "ASIN:" -#: bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:85 msgid "View on OpenLibrary" msgstr "Ver en OpenLibrary" -#: bookwyrm/templates/book/book.html:91 +#: bookwyrm/templates/book/book.html:94 #, 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:97 +#: bookwyrm/templates/book/book.html:100 msgid "Add Description" msgstr "Agregar descripción" -#: bookwyrm/templates/book/book.html:104 +#: bookwyrm/templates/book/book.html:107 #: bookwyrm/templates/book/edit_book.html:101 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Descripción:" -#: bookwyrm/templates/book/book.html:108 +#: bookwyrm/templates/book/book.html:111 #: bookwyrm/templates/book/edit_book.html:225 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -182,7 +188,7 @@ msgstr "Descripción:" msgid "Save" msgstr "Guardar" -#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:226 #: bookwyrm/templates/edit_author.html:79 @@ -197,74 +203,65 @@ msgstr "Guardar" msgid "Cancel" msgstr "Cancelar" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:121 #, python-format msgid "%(count)s editions" msgstr "%(count)s ediciones" -#: bookwyrm/templates/book/book.html:126 +#: bookwyrm/templates/book/book.html:129 #, 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:132 +#: bookwyrm/templates/book/book.html:135 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Una edición diferente de este libro está en tu %(shelf_name)s estante." -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:144 msgid "Your reading activity" msgstr "Tu actividad de lectura" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 msgid "Add read dates" msgstr "Agregar fechas de lectura" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:151 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:155 +#: bookwyrm/templates/book/book.html:158 msgid "Create" msgstr "Crear" -#: bookwyrm/templates/book/book.html:177 -msgid "Tags" -msgstr "Etiquetas" - -#: bookwyrm/templates/book/book.html:181 -#: bookwyrm/templates/snippets/tag.html:18 -msgid "Add tag" -msgstr "Agregar etiqueta" - -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:180 msgid "Subjects" msgstr "Sujetos" -#: bookwyrm/templates/book/book.html:209 +#: bookwyrm/templates/book/book.html:191 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:231 +#: bookwyrm/templates/book/book.html:213 #, fuzzy #| msgid "Go to list" msgid "Add to list" msgstr "Irse a lista" -#: bookwyrm/templates/book/book.html:241 +#: bookwyrm/templates/book/book.html:223 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:90 msgid "Add" msgstr "Agregar" -#: bookwyrm/templates/book/book.html:269 +#: bookwyrm/templates/book/book.html:251 msgid "rated it" msgstr "lo calificó con" @@ -500,6 +497,8 @@ msgstr "" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/feed/feed_layout.html:57 +#: bookwyrm/templates/get_started/layout.html:15 +#: bookwyrm/templates/get_started/layout.html:48 msgid "Close" msgstr "Cerrar" @@ -614,6 +613,7 @@ msgid "Recent Books" msgstr "Libros recientes" #: bookwyrm/templates/discover/landing_layout.html:5 +#: bookwyrm/templates/get_started/layout.html:4 msgid "Welcome" msgstr "Bienvenidos" @@ -825,23 +825,10 @@ msgid "There aren't any activities right now! Try following a user to get starte msgstr "¡No hay actividades en este momento! Sigue a otro usuario para empezar" #: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/get_started/users.html:6 msgid "Who to follow" msgstr "" -#: bookwyrm/templates/feed/feed.html:69 -#, python-format -msgid "%(mutuals)s follower you follow" -msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "" -msgstr[1] "" - -#: bookwyrm/templates/feed/feed.html:72 -#, python-format -msgid "%(shared_books)s book on your shelves" -msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "" -msgstr[1] "" - #: bookwyrm/templates/feed/feed_layout.html:5 msgid "Updates" msgstr "Actualizaciones" @@ -878,6 +865,160 @@ msgstr "Leer" msgid "%(year)s Reading Goal" msgstr "%(year)s Meta de lectura" +#: bookwyrm/templates/feed/suggested_users.html:16 +#, python-format +msgid "%(mutuals)s follower you follow" +msgid_plural "%(mutuals)s followers you follow" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/feed/suggested_users.html:19 +#, python-format +msgid "%(shared_books)s book on your shelves" +msgid_plural "%(shared_books)s books on your shelves" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/get_started/book_preview.html:6 +#, fuzzy, python-format +#| msgid "Want to Read \"%(book_title)s\"" +msgid "Have you read %(book_title)s?" +msgstr "Quiero leer \"%(book_title)s\"" + +#: bookwyrm/templates/get_started/books.html:6 +#, fuzzy +#| msgid "Started reading" +msgid "What are you reading?" +msgstr "Lectura se empezó" + +#: bookwyrm/templates/get_started/books.html:9 +#: bookwyrm/templates/lists/list.html:58 +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\"" + +#: bookwyrm/templates/get_started/books.html:11 +#, python-format +msgid "You can add books when you start using %(site_name)s." +msgstr "" + +#: bookwyrm/templates/get_started/books.html:16 +#: bookwyrm/templates/get_started/books.html:17 +#: bookwyrm/templates/get_started/users.html:18 +#: bookwyrm/templates/get_started/users.html:19 +#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/lists/list.html:62 +msgid "Search" +msgstr "Buscar" + +#: bookwyrm/templates/get_started/books.html:26 +#, fuzzy +#| msgid "Suggest Books" +msgid "Suggested Books" +msgstr "Sugerir libros" + +#: bookwyrm/templates/get_started/books.html:41 +#, fuzzy, python-format +#| msgid "About %(site_name)s" +msgid "Popular on %(site_name)s" +msgstr "Sobre %(site_name)s" + +#: bookwyrm/templates/get_started/books.html:51 +#: bookwyrm/templates/lists/list.html:75 +msgid "No books found" +msgstr "No se encontró ningún libro" + +#: bookwyrm/templates/get_started/books.html:54 +#: bookwyrm/templates/get_started/profile.html:54 +msgid "Save & continue" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:13 +#, fuzzy +#| msgid "Started" +msgid "Getting Started" +msgstr "Empezado" + +#: bookwyrm/templates/get_started/layout.html:26 +#: bookwyrm/templates/get_started/profile.html:6 +#, fuzzy +#| msgid "User Profile" +msgid "Create your profile" +msgstr "Perfil de usuario" + +#: bookwyrm/templates/get_started/layout.html:30 +#, fuzzy +#| msgid "Add Books" +msgid "Add books" +msgstr "Agregar libros" + +#: bookwyrm/templates/get_started/layout.html:34 +#, fuzzy +#| msgid "Friendly" +msgid "Find friends" +msgstr "Amigable" + +#: bookwyrm/templates/get_started/layout.html:40 +msgid "Skip this step" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:44 +#, fuzzy +#| msgid "Finished" +msgid "Finish" +msgstr "Terminado" + +#: bookwyrm/templates/get_started/profile.html:15 +#: bookwyrm/templates/preferences/edit_user.html:24 +msgid "Display name:" +msgstr "Nombre de visualización:" + +#: bookwyrm/templates/get_started/profile.html:22 +#: bookwyrm/templates/preferences/edit_user.html:31 +msgid "Summary:" +msgstr "Resumen:" + +#: bookwyrm/templates/get_started/profile.html:23 +msgid "A little bit about you" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/preferences/edit_user.html:17 +msgid "Avatar:" +msgstr "Avatar:" + +#: bookwyrm/templates/get_started/profile.html:42 +#: bookwyrm/templates/preferences/edit_user.html:52 +msgid "Manually approve followers:" +msgstr "Aprobar seguidores a mano:" + +#: bookwyrm/templates/get_started/profile.html:48 +#: bookwyrm/templates/preferences/edit_user.html:58 +msgid "Show this account in suggested users:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:52 +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." +msgstr "" + +#: bookwyrm/templates/get_started/users.html:11 +#, fuzzy +#| msgid "Search for a book or user" +msgid "Search for a user" +msgstr "Buscar un libro o un usuario" + +#: bookwyrm/templates/get_started/users.html:13 +#: bookwyrm/templates/search_results.html:76 +#, python-format +msgid "No users found for \"%(query)s\"" +msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\"" + #: bookwyrm/templates/goal.html:7 #, python-format msgid "%(year)s Reading Progress" @@ -1038,21 +1179,10 @@ msgstr "Resultados de búsqueda por \"%(query)s\"" msgid "Matching Books" msgstr "Libros correspondientes" -#: 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\"" - #: bookwyrm/templates/layout.html:33 msgid "Search for a book or user" msgstr "Buscar un libro o un usuario" -#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 -#: bookwyrm/templates/lists/list.html:62 -msgid "Search" -msgstr "Buscar" - #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 msgid "Main navigation menu" msgstr "Menú de navigación central" @@ -1229,10 +1359,6 @@ msgstr "Agregar libros" msgid "Suggest Books" msgstr "Sugerir libros" -#: bookwyrm/templates/lists/list.html:58 -msgid "Search for a book" -msgstr "Buscar libros" - #: bookwyrm/templates/lists/list.html:63 msgid "search" msgstr "buscar" @@ -1246,10 +1372,6 @@ msgstr "Borrar búsqueda" 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:75 -msgid "No books found" -msgstr "No se encontró ningún libro" - #: bookwyrm/templates/lists/list.html:90 msgid "Suggest" msgstr "Sugerir" @@ -1554,30 +1676,10 @@ msgstr "Nueva contraseña:" msgid "Edit Profile" msgstr "Editar perfil" -#: bookwyrm/templates/preferences/edit_user.html:17 -msgid "Avatar:" -msgstr "Avatar:" - -#: bookwyrm/templates/preferences/edit_user.html:24 -msgid "Display name:" -msgstr "Nombre de visualización:" - -#: bookwyrm/templates/preferences/edit_user.html:31 -msgid "Summary:" -msgstr "Resumen:" - #: bookwyrm/templates/preferences/edit_user.html:46 msgid "Show set reading goal prompt in feed:" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:52 -msgid "Manually approve followers:" -msgstr "Aprobar seguidores a mano:" - -#: bookwyrm/templates/preferences/edit_user.html:58 -msgid "Show this account in suggested users:" -msgstr "" - #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." @@ -1611,11 +1713,6 @@ msgstr "Ocultar resultados de otros catálogos" msgid "Matching Users" msgstr "Usuarios correspondientes" -#: bookwyrm/templates/search_results.html:76 -#, python-format -msgid "No users found for \"%(query)s\"" -msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\"" - #: bookwyrm/templates/search_results.html:93 #, python-format msgid "No lists found for \"%(query)s\"" @@ -2468,6 +2565,10 @@ msgstr "Lectura se empezó" msgid "Remove tag" msgstr "Eliminar etiqueta" +#: bookwyrm/templates/snippets/tag.html:18 +msgid "Add tag" +msgstr "Agregar etiqueta" + #: bookwyrm/templates/tag.html:9 #, python-format msgid "Books tagged \"%(tag.name)s\"" @@ -2525,7 +2626,7 @@ msgstr "Listas: %(username)s" msgid "Create list" msgstr "Crear lista" -#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53 +#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56 #, fuzzy #| msgid "books" msgid "All books" @@ -2551,11 +2652,11 @@ msgstr "Empezado" msgid "Finished" msgstr "Terminado" -#: bookwyrm/templates/user/shelf.html:122 +#: bookwyrm/templates/user/shelf.html:127 msgid "This shelf is empty." msgstr "Este estante está vacio." -#: bookwyrm/templates/user/shelf.html:128 +#: bookwyrm/templates/user/shelf.html:133 msgid "Delete shelf" msgstr "Eliminar estante" @@ -2632,6 +2733,14 @@ msgstr "Ya existe un usuario con ese nombre." msgid "A password reset link sent to %s" msgstr "" +#, fuzzy, python-format +#~| msgid "No users found for \"%(query)s\"" +#~ msgid "No users were found for \"%(query)s\"" +#~ msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\"" + +#~ msgid "Tags" +#~ msgstr "Etiquetas" + #~ msgid "Your shelves" #~ msgstr "Tus estantes" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index f3f76f03d..1a23164b1 100644 Binary files a/locale/fr_FR/LC_MESSAGES/django.mo and b/locale/fr_FR/LC_MESSAGES/django.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 7677b0ed1..db5adfd72 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-31 10:36-0700\n" +"POT-Creation-Date: 2021-04-01 12:22-0700\n" "PO-Revision-Date: 2021-03-02 12:37+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -18,32 +18,32 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:213 +#: bookwyrm/forms.py:226 msgid "A user with this email already exists." msgstr "" -#: bookwyrm/forms.py:227 +#: bookwyrm/forms.py:240 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:228 +#: bookwyrm/forms.py:241 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:229 +#: bookwyrm/forms.py:242 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:230 +#: bookwyrm/forms.py:243 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:248 #, python-format msgid "%(count)d uses" msgstr "" -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:251 #, fuzzy #| msgid "Unlisted" msgid "Unlimited" @@ -137,44 +137,50 @@ msgstr "Modifier le livre" msgid "Add cover" msgstr "Ajouter une couverture" -#: bookwyrm/templates/book/book.html:59 +#: bookwyrm/templates/book/book.html:53 +#, fuzzy +#| msgid "Failed to load" +msgid "Failed to load cover" +msgstr "Items non importés" + +#: bookwyrm/templates/book/book.html:62 msgid "ISBN:" msgstr "ISBN :" -#: bookwyrm/templates/book/book.html:66 +#: bookwyrm/templates/book/book.html:69 #: bookwyrm/templates/book/edit_book.html:211 msgid "OCLC Number:" msgstr "Numéro OCLC :" -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:76 #: bookwyrm/templates/book/edit_book.html:215 msgid "ASIN:" msgstr "ASIN :" -#: bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:85 msgid "View on OpenLibrary" msgstr "Voir sur OpenLibrary" -#: bookwyrm/templates/book/book.html:91 +#: bookwyrm/templates/book/book.html:94 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:97 +#: bookwyrm/templates/book/book.html:100 #, fuzzy #| msgid "Description:" msgid "Add Description" msgstr "Ajouter une description" -#: bookwyrm/templates/book/book.html:104 +#: bookwyrm/templates/book/book.html:107 #: bookwyrm/templates/book/edit_book.html:101 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Description :" -#: bookwyrm/templates/book/book.html:108 +#: bookwyrm/templates/book/book.html:111 #: bookwyrm/templates/book/edit_book.html:225 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -186,7 +192,7 @@ msgstr "Description :" msgid "Save" msgstr "Enregistrer" -#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:226 #: bookwyrm/templates/edit_author.html:79 @@ -201,79 +207,70 @@ msgstr "Enregistrer" msgid "Cancel" msgstr "Annuler" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:121 #, fuzzy, python-format #| msgid "Editions of \"%(work_title)s\"" msgid "%(count)s editions" msgstr "%(title)s par " -#: bookwyrm/templates/book/book.html:126 +#: bookwyrm/templates/book/book.html:129 #, fuzzy, python-format #| msgid "favorited your %(preview_name)s" msgid "This edition is on your %(shelf_name)s shelf." msgstr "Messages directs avec %(username)s" -#: bookwyrm/templates/book/book.html:132 +#: bookwyrm/templates/book/book.html:135 #, fuzzy, python-format #| msgid "replied to your %(preview_name)s" msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr " a ajouté %(book_title)s à votre liste « %(list_name)s »" -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:144 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 #, fuzzy #| msgid "Edit read dates" msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:151 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:155 +#: bookwyrm/templates/book/book.html:158 msgid "Create" msgstr "Créer" -#: bookwyrm/templates/book/book.html:177 -msgid "Tags" -msgstr "Tags" - -#: bookwyrm/templates/book/book.html:181 -#: bookwyrm/templates/snippets/tag.html:18 -msgid "Add tag" -msgstr "Ajouter un tag" - -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:180 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book/book.html:209 +#: bookwyrm/templates/book/book.html:191 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "Listes" -#: bookwyrm/templates/book/book.html:231 +#: bookwyrm/templates/book/book.html:213 #, fuzzy #| msgid "Go to list" msgid "Add to list" msgstr "Aller à la liste" -#: bookwyrm/templates/book/book.html:241 +#: bookwyrm/templates/book/book.html:223 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:90 msgid "Add" msgstr "Ajouter" -#: bookwyrm/templates/book/book.html:269 +#: bookwyrm/templates/book/book.html:251 msgid "rated it" msgstr "l’a noté" @@ -512,6 +509,8 @@ msgstr "" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/feed/feed_layout.html:57 +#: bookwyrm/templates/get_started/layout.html:15 +#: bookwyrm/templates/get_started/layout.html:48 #, fuzzy #| msgid "Closed" msgid "Close" @@ -631,6 +630,7 @@ msgid "Recent Books" msgstr "Livres récents" #: bookwyrm/templates/discover/landing_layout.html:5 +#: bookwyrm/templates/get_started/layout.html:4 msgid "Welcome" msgstr "Bienvenue" @@ -842,23 +842,10 @@ msgid "There aren't any activities right now! Try following a user to get starte msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer" #: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/get_started/users.html:6 msgid "Who to follow" msgstr "" -#: bookwyrm/templates/feed/feed.html:69 -#, python-format -msgid "%(mutuals)s follower you follow" -msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "" -msgstr[1] "" - -#: bookwyrm/templates/feed/feed.html:72 -#, python-format -msgid "%(shared_books)s book on your shelves" -msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "" -msgstr[1] "" - #: bookwyrm/templates/feed/feed_layout.html:5 #, fuzzy #| msgid "Updated:" @@ -901,6 +888,160 @@ msgstr "Lu" msgid "%(year)s Reading Goal" msgstr "Défi lecture pour %(year)s" +#: bookwyrm/templates/feed/suggested_users.html:16 +#, python-format +msgid "%(mutuals)s follower you follow" +msgid_plural "%(mutuals)s followers you follow" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/feed/suggested_users.html:19 +#, python-format +msgid "%(shared_books)s book on your shelves" +msgid_plural "%(shared_books)s books on your shelves" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/get_started/book_preview.html:6 +#, fuzzy, python-format +#| msgid "Want to Read \"%(book_title)s\"" +msgid "Have you read %(book_title)s?" +msgstr "A envie de lire « %(book_title)s »" + +#: bookwyrm/templates/get_started/books.html:6 +#, fuzzy +#| msgid "Started reading" +msgid "What are you reading?" +msgstr "Lecture commencée le" + +#: bookwyrm/templates/get_started/books.html:9 +#: bookwyrm/templates/lists/list.html:58 +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 »" + +#: bookwyrm/templates/get_started/books.html:11 +#, python-format +msgid "You can add books when you start using %(site_name)s." +msgstr "" + +#: bookwyrm/templates/get_started/books.html:16 +#: bookwyrm/templates/get_started/books.html:17 +#: bookwyrm/templates/get_started/users.html:18 +#: bookwyrm/templates/get_started/users.html:19 +#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/lists/list.html:62 +msgid "Search" +msgstr "Chercher" + +#: bookwyrm/templates/get_started/books.html:26 +#, fuzzy +#| msgid "Suggest Books" +msgid "Suggested Books" +msgstr "Suggérer des livres" + +#: bookwyrm/templates/get_started/books.html:41 +#, fuzzy, python-format +#| msgid "Join %(name)s" +msgid "Popular on %(site_name)s" +msgstr "À propos de %(name)s" + +#: bookwyrm/templates/get_started/books.html:51 +#: bookwyrm/templates/lists/list.html:75 +msgid "No books found" +msgstr "Aucun livre trouvé" + +#: bookwyrm/templates/get_started/books.html:54 +#: bookwyrm/templates/get_started/profile.html:54 +msgid "Save & continue" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:13 +#, fuzzy +#| msgid "Started" +msgid "Getting Started" +msgstr "Commencé" + +#: bookwyrm/templates/get_started/layout.html:26 +#: bookwyrm/templates/get_started/profile.html:6 +#, fuzzy +#| msgid "User Profile" +msgid "Create your profile" +msgstr "Profil" + +#: bookwyrm/templates/get_started/layout.html:30 +#, fuzzy +#| msgid "Add Books" +msgid "Add books" +msgstr "Ajouter des livres" + +#: bookwyrm/templates/get_started/layout.html:34 +#, fuzzy +#| msgid "Friendly" +msgid "Find friends" +msgstr "Sympa" + +#: bookwyrm/templates/get_started/layout.html:40 +msgid "Skip this step" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:44 +#, fuzzy +#| msgid "Finished" +msgid "Finish" +msgstr "Terminé" + +#: bookwyrm/templates/get_started/profile.html:15 +#: bookwyrm/templates/preferences/edit_user.html:24 +msgid "Display name:" +msgstr "Nom affiché :" + +#: bookwyrm/templates/get_started/profile.html:22 +#: bookwyrm/templates/preferences/edit_user.html:31 +msgid "Summary:" +msgstr "Résumé :" + +#: bookwyrm/templates/get_started/profile.html:23 +msgid "A little bit about you" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/preferences/edit_user.html:17 +msgid "Avatar:" +msgstr "Avatar :" + +#: bookwyrm/templates/get_started/profile.html:42 +#: bookwyrm/templates/preferences/edit_user.html:52 +msgid "Manually approve followers:" +msgstr "Autoriser les abonnements manuellement :" + +#: bookwyrm/templates/get_started/profile.html:48 +#: bookwyrm/templates/preferences/edit_user.html:58 +msgid "Show this account in suggested users:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:52 +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." +msgstr "" + +#: bookwyrm/templates/get_started/users.html:11 +#, fuzzy +#| msgid "Search for a book or user" +msgid "Search for a user" +msgstr "Chercher un livre ou un compte" + +#: bookwyrm/templates/get_started/users.html:13 +#: bookwyrm/templates/search_results.html:76 +#, python-format +msgid "No users found for \"%(query)s\"" +msgstr "Aucun compte trouvé pour « %(query)s »" + #: bookwyrm/templates/goal.html:7 #, python-format msgid "%(year)s Reading Progress" @@ -1065,21 +1206,10 @@ msgstr "Résultats de recherche pour « %(query)s »" msgid "Matching Books" msgstr "Livres correspondants" -#: 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 »" - #: bookwyrm/templates/layout.html:33 msgid "Search for a book or user" msgstr "Chercher un livre ou un compte" -#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 -#: bookwyrm/templates/lists/list.html:62 -msgid "Search" -msgstr "Chercher" - #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 msgid "Main navigation menu" msgstr "Menu de navigation principal " @@ -1261,10 +1391,6 @@ msgstr "Ajouter des livres" msgid "Suggest Books" msgstr "Suggérer des livres" -#: bookwyrm/templates/lists/list.html:58 -msgid "Search for a book" -msgstr "Chercher un livre" - #: bookwyrm/templates/lists/list.html:63 msgid "search" msgstr "Chercher" @@ -1278,10 +1404,6 @@ msgstr "Vider la requête" msgid "No books found matching the query \"%(query)s\"" msgstr "Aucun livre trouvé pour la requête « %(query)s »" -#: bookwyrm/templates/lists/list.html:75 -msgid "No books found" -msgstr "Aucun livre trouvé" - #: bookwyrm/templates/lists/list.html:90 msgid "Suggest" msgstr "Suggérer" @@ -1586,30 +1708,10 @@ msgstr "Nouveau mot de passe :" msgid "Edit Profile" msgstr "Modifier le profil" -#: bookwyrm/templates/preferences/edit_user.html:17 -msgid "Avatar:" -msgstr "Avatar :" - -#: bookwyrm/templates/preferences/edit_user.html:24 -msgid "Display name:" -msgstr "Nom affiché :" - -#: bookwyrm/templates/preferences/edit_user.html:31 -msgid "Summary:" -msgstr "Résumé :" - #: bookwyrm/templates/preferences/edit_user.html:46 msgid "Show set reading goal prompt in feed:" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:52 -msgid "Manually approve followers:" -msgstr "Autoriser les abonnements manuellement :" - -#: bookwyrm/templates/preferences/edit_user.html:58 -msgid "Show this account in suggested users:" -msgstr "" - #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." @@ -1643,11 +1745,6 @@ msgstr "Masquer les résultats d’autres catalogues" msgid "Matching Users" msgstr "Comptes correspondants" -#: bookwyrm/templates/search_results.html:76 -#, python-format -msgid "No users found for \"%(query)s\"" -msgstr "Aucun compte trouvé pour « %(query)s »" - #: bookwyrm/templates/search_results.html:93 #, python-format msgid "No lists found for \"%(query)s\"" @@ -2506,6 +2603,10 @@ msgstr "Lecture commencée le" msgid "Remove tag" msgstr "Supprimer le tag" +#: bookwyrm/templates/snippets/tag.html:18 +msgid "Add tag" +msgstr "Ajouter un tag" + #: bookwyrm/templates/tag.html:9 #, python-format msgid "Books tagged \"%(tag.name)s\"" @@ -2564,7 +2665,7 @@ msgstr "Listes : %(username)s" msgid "Create list" msgstr "Créer une liste" -#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53 +#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56 #, fuzzy #| msgid "books" msgid "All books" @@ -2590,11 +2691,11 @@ msgstr "Commencé" msgid "Finished" msgstr "Terminé" -#: bookwyrm/templates/user/shelf.html:122 +#: bookwyrm/templates/user/shelf.html:127 msgid "This shelf is empty." msgstr "Cette étagère est vide" -#: bookwyrm/templates/user/shelf.html:128 +#: bookwyrm/templates/user/shelf.html:133 msgid "Delete shelf" msgstr "Supprimer l’étagère" @@ -2670,6 +2771,14 @@ msgstr "" msgid "A password reset link sent to %s" msgstr "" +#, fuzzy, python-format +#~| msgid "No users found for \"%(query)s\"" +#~ msgid "No users were found for \"%(query)s\"" +#~ msgstr "Aucun compte trouvé pour « %(query)s »" + +#~ msgid "Tags" +#~ msgstr "Tags" + #~ msgid "Your shelves" #~ msgstr "Vos étagères" diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index 819542795..3fe34104e 100644 Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and b/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 8680ab967..fc2556842 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-31 10:36-0700\n" +"POT-Creation-Date: 2021-04-01 12:22-0700\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -18,34 +18,34 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:213 +#: bookwyrm/forms.py:226 #, fuzzy #| msgid "A user with that username already exists." msgid "A user with this email already exists." msgstr "已经存在使用该用户名的用户。" -#: bookwyrm/forms.py:227 +#: bookwyrm/forms.py:240 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:228 +#: bookwyrm/forms.py:241 msgid "One Week" msgstr "一周" -#: bookwyrm/forms.py:229 +#: bookwyrm/forms.py:242 msgid "One Month" msgstr "一个月" -#: bookwyrm/forms.py:230 +#: bookwyrm/forms.py:243 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:235 +#: bookwyrm/forms.py:248 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:238 +#: bookwyrm/forms.py:251 msgid "Unlimited" msgstr "不受限" @@ -135,41 +135,47 @@ msgstr "编辑书目" msgid "Add cover" msgstr "添加封面" -#: bookwyrm/templates/book/book.html:59 +#: bookwyrm/templates/book/book.html:53 +#, fuzzy +#| msgid "Failed to load" +msgid "Failed to load cover" +msgstr "加载失败" + +#: bookwyrm/templates/book/book.html:62 msgid "ISBN:" msgstr "ISBN:" -#: bookwyrm/templates/book/book.html:66 +#: bookwyrm/templates/book/book.html:69 #: bookwyrm/templates/book/edit_book.html:211 msgid "OCLC Number:" msgstr "OCLC 号:" -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:76 #: bookwyrm/templates/book/edit_book.html:215 msgid "ASIN:" msgstr "ASIN:" -#: bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:85 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 查看" -#: bookwyrm/templates/book/book.html:91 +#: bookwyrm/templates/book/book.html:94 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 则书评)" -#: bookwyrm/templates/book/book.html:97 +#: bookwyrm/templates/book/book.html:100 msgid "Add Description" msgstr "添加描述" -#: bookwyrm/templates/book/book.html:104 +#: bookwyrm/templates/book/book.html:107 #: bookwyrm/templates/book/edit_book.html:101 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:108 +#: bookwyrm/templates/book/book.html:111 #: bookwyrm/templates/book/edit_book.html:225 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -181,7 +187,7 @@ msgstr "描述:" msgid "Save" msgstr "保存" -#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:226 #: bookwyrm/templates/edit_author.html:79 @@ -196,72 +202,63 @@ msgstr "保存" msgid "Cancel" msgstr "取消" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:121 #, python-format msgid "%(count)s editions" msgstr "%(count)s 个版本" -#: bookwyrm/templates/book/book.html:126 +#: bookwyrm/templates/book/book.html:129 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "此版本在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:132 +#: bookwyrm/templates/book/book.html:135 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "本书的 另一个版本 在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:144 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book/book.html:148 +#: bookwyrm/templates/book/book.html:151 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book/book.html:155 +#: bookwyrm/templates/book/book.html:158 msgid "Create" msgstr "创建" -#: bookwyrm/templates/book/book.html:177 -msgid "Tags" -msgstr "标签" - -#: bookwyrm/templates/book/book.html:181 -#: bookwyrm/templates/snippets/tag.html:18 -msgid "Add tag" -msgstr "添加标签" - -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:180 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book/book.html:209 +#: bookwyrm/templates/book/book.html:191 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:231 +#: bookwyrm/templates/book/book.html:213 msgid "Add to list" msgstr "添加到列表" -#: bookwyrm/templates/book/book.html:241 +#: bookwyrm/templates/book/book.html:223 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:90 msgid "Add" msgstr "添加" -#: bookwyrm/templates/book/book.html:269 +#: bookwyrm/templates/book/book.html:251 msgid "rated it" msgstr "评价了" @@ -483,6 +480,8 @@ msgstr "由 %(publisher)s 出版。" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/feed/feed_layout.html:57 +#: bookwyrm/templates/get_started/layout.html:15 +#: bookwyrm/templates/get_started/layout.html:48 msgid "Close" msgstr "关闭" @@ -595,6 +594,7 @@ msgid "Recent Books" msgstr "最近书目" #: bookwyrm/templates/discover/landing_layout.html:5 +#: bookwyrm/templates/get_started/layout.html:4 msgid "Welcome" msgstr "欢迎" @@ -808,21 +808,10 @@ msgid "There aren't any activities right now! Try following a user to get starte msgstr "现在还没有任何活动！尝试着从关注一个用户开始吧" #: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/get_started/users.html:6 msgid "Who to follow" msgstr "" -#: bookwyrm/templates/feed/feed.html:69 -#, python-format -msgid "%(mutuals)s follower you follow" -msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "" - -#: bookwyrm/templates/feed/feed.html:72 -#, python-format -msgid "%(shared_books)s book on your shelves" -msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "" - #: bookwyrm/templates/feed/feed_layout.html:5 msgid "Updates" msgstr "更新" @@ -859,6 +848,158 @@ msgstr "读过" msgid "%(year)s Reading Goal" msgstr "%(year)s 阅读目标" +#: bookwyrm/templates/feed/suggested_users.html:16 +#, python-format +msgid "%(mutuals)s follower you follow" +msgid_plural "%(mutuals)s followers you follow" +msgstr[0] "" + +#: bookwyrm/templates/feed/suggested_users.html:19 +#, python-format +msgid "%(shared_books)s book on your shelves" +msgid_plural "%(shared_books)s books on your shelves" +msgstr[0] "" + +#: bookwyrm/templates/get_started/book_preview.html:6 +#, fuzzy, python-format +#| msgid "Want to Read \"%(book_title)s\"" +msgid "Have you read %(book_title)s?" +msgstr "想要阅读 \"%(book_title)s\"" + +#: bookwyrm/templates/get_started/books.html:6 +#, fuzzy +#| msgid "Started reading" +msgid "What are you reading?" +msgstr "已开始阅读" + +#: bookwyrm/templates/get_started/books.html:9 +#: bookwyrm/templates/lists/list.html:58 +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\" 的书目" + +#: bookwyrm/templates/get_started/books.html:11 +#, python-format +msgid "You can add books when you start using %(site_name)s." +msgstr "" + +#: bookwyrm/templates/get_started/books.html:16 +#: bookwyrm/templates/get_started/books.html:17 +#: bookwyrm/templates/get_started/users.html:18 +#: bookwyrm/templates/get_started/users.html:19 +#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 +#: bookwyrm/templates/lists/list.html:62 +msgid "Search" +msgstr "搜索" + +#: bookwyrm/templates/get_started/books.html:26 +#, fuzzy +#| msgid "Suggest Books" +msgid "Suggested Books" +msgstr "推荐书目" + +#: bookwyrm/templates/get_started/books.html:41 +#, fuzzy, python-format +#| msgid "About %(site_name)s" +msgid "Popular on %(site_name)s" +msgstr "关于 %(site_name)s" + +#: bookwyrm/templates/get_started/books.html:51 +#: bookwyrm/templates/lists/list.html:75 +msgid "No books found" +msgstr "没有找到书目" + +#: bookwyrm/templates/get_started/books.html:54 +#: bookwyrm/templates/get_started/profile.html:54 +msgid "Save & continue" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:13 +#, fuzzy +#| msgid "Started" +msgid "Getting Started" +msgstr "已开始" + +#: bookwyrm/templates/get_started/layout.html:26 +#: bookwyrm/templates/get_started/profile.html:6 +#, fuzzy +#| msgid "View user profile" +msgid "Create your profile" +msgstr "查看用户个人资料" + +#: bookwyrm/templates/get_started/layout.html:30 +#, fuzzy +#| msgid "Add Books" +msgid "Add books" +msgstr "添加书目" + +#: bookwyrm/templates/get_started/layout.html:34 +#, fuzzy +#| msgid "Friendly" +msgid "Find friends" +msgstr "友好" + +#: bookwyrm/templates/get_started/layout.html:40 +msgid "Skip this step" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:44 +#, fuzzy +#| msgid "Finished" +msgid "Finish" +msgstr "已完成" + +#: bookwyrm/templates/get_started/profile.html:15 +#: bookwyrm/templates/preferences/edit_user.html:24 +msgid "Display name:" +msgstr "显示名称:" + +#: bookwyrm/templates/get_started/profile.html:22 +#: bookwyrm/templates/preferences/edit_user.html:31 +msgid "Summary:" +msgstr "概要:" + +#: bookwyrm/templates/get_started/profile.html:23 +msgid "A little bit about you" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/preferences/edit_user.html:17 +msgid "Avatar:" +msgstr "头像:" + +#: bookwyrm/templates/get_started/profile.html:42 +#: bookwyrm/templates/preferences/edit_user.html:52 +msgid "Manually approve followers:" +msgstr "手动批准关注者:" + +#: bookwyrm/templates/get_started/profile.html:48 +#: bookwyrm/templates/preferences/edit_user.html:58 +msgid "Show this account in suggested users:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:52 +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." +msgstr "" + +#: bookwyrm/templates/get_started/users.html:11 +#, fuzzy +#| msgid "Search for a book or user" +msgid "Search for a user" +msgstr "搜索书目或用户" + +#: bookwyrm/templates/get_started/users.html:13 +#: bookwyrm/templates/search_results.html:76 +#, python-format +msgid "No users found for \"%(query)s\"" +msgstr "没有找到 \"%(query)s\" 的用户" + #: bookwyrm/templates/goal.html:7 #, python-format msgid "%(year)s Reading Progress" @@ -1019,21 +1160,10 @@ msgstr "\"%(query)s\" 的搜索结果" msgid "Matching Books" msgstr "匹配的书目" -#: 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\" 的书目" - #: bookwyrm/templates/layout.html:33 msgid "Search for a book or user" msgstr "搜索书目或用户" -#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 -#: bookwyrm/templates/lists/list.html:62 -msgid "Search" -msgstr "搜索" - #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48 msgid "Main navigation menu" msgstr "主导航菜单" @@ -1208,10 +1338,6 @@ msgstr "添加书目" msgid "Suggest Books" msgstr "推荐书目" -#: bookwyrm/templates/lists/list.html:58 -msgid "Search for a book" -msgstr "搜索书目" - #: bookwyrm/templates/lists/list.html:63 msgid "search" msgstr "搜索" @@ -1225,10 +1351,6 @@ msgstr "清除搜索" msgid "No books found matching the query \"%(query)s\"" msgstr "没有符合 \"%(query)s\" 请求的书目" -#: bookwyrm/templates/lists/list.html:75 -msgid "No books found" -msgstr "没有找到书目" - #: bookwyrm/templates/lists/list.html:90 msgid "Suggest" msgstr "推荐" @@ -1519,30 +1641,10 @@ msgstr "新密码:" msgid "Edit Profile" msgstr "编辑个人资料" -#: bookwyrm/templates/preferences/edit_user.html:17 -msgid "Avatar:" -msgstr "头像:" - -#: bookwyrm/templates/preferences/edit_user.html:24 -msgid "Display name:" -msgstr "显示名称:" - -#: bookwyrm/templates/preferences/edit_user.html:31 -msgid "Summary:" -msgstr "概要:" - #: bookwyrm/templates/preferences/edit_user.html:46 msgid "Show set reading goal prompt in feed:" msgstr "在消息流中显示设置阅读目标的提示:" -#: bookwyrm/templates/preferences/edit_user.html:52 -msgid "Manually approve followers:" -msgstr "手动批准关注者:" - -#: bookwyrm/templates/preferences/edit_user.html:58 -msgid "Show this account in suggested users:" -msgstr "" - #: bookwyrm/templates/preferences/edit_user.html:62 #, python-format msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." @@ -1576,11 +1678,6 @@ msgstr "隐藏其它类别的结果" msgid "Matching Users" msgstr "匹配的用户" -#: bookwyrm/templates/search_results.html:76 -#, python-format -msgid "No users found for \"%(query)s\"" -msgstr "没有找到 \"%(query)s\" 的用户" - #: bookwyrm/templates/search_results.html:93 #, python-format msgid "No lists found for \"%(query)s\"" @@ -2425,6 +2522,10 @@ msgstr "已开始阅读" msgid "Remove tag" msgstr "移除标签" +#: bookwyrm/templates/snippets/tag.html:18 +msgid "Add tag" +msgstr "添加标签" + #: bookwyrm/templates/tag.html:9 #, python-format msgid "Books tagged \"%(tag.name)s\"" @@ -2482,7 +2583,7 @@ msgstr "列表: %(username)s" msgid "Create list" msgstr "创建列表" -#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53 +#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56 #, fuzzy #| msgid "books" msgid "All books" @@ -2508,11 +2609,11 @@ msgstr "已开始" msgid "Finished" msgstr "已完成" -#: bookwyrm/templates/user/shelf.html:122 +#: bookwyrm/templates/user/shelf.html:127 msgid "This shelf is empty." msgstr "此书架是空的。" -#: bookwyrm/templates/user/shelf.html:128 +#: bookwyrm/templates/user/shelf.html:133 msgid "Delete shelf" msgstr "删除书架" @@ -2588,6 +2689,14 @@ msgstr "已经存在使用该用户名的用户。" msgid "A password reset link sent to %s" msgstr "" +#, fuzzy, python-format +#~| msgid "No users found for \"%(query)s\"" +#~ msgid "No users were found for \"%(query)s\"" +#~ msgstr "没有找到 \"%(query)s\" 的用户" + +#~ msgid "Tags" +#~ msgstr "标签" + #~ msgid "Your shelves" #~ msgstr "你的书架"